Menu
▾
▴
plplot-cvs
|
From: <ai...@us...> - 2014-01-04 22:38:24
|
Revision: 12917
http://sourceforge.net/p/plplot/code/12917
Author: airwin
Date: 2014-01-04 22:38:22 +0000 (Sat, 04 Jan 2014)
Log Message:
-----------
Add a setup for the "MinGW Makefiles" generator case.
Add the MAKE_COMMAND environment variable for the "MSYS Makefiles"
generator case.
Modified Paths:
--------------
trunk/cmake/epa_build/setup/setup_msys_makefiles
Added Paths:
-----------
trunk/cmake/epa_build/setup/setup_mingw_makefiles
Added: trunk/cmake/epa_build/setup/setup_mingw_makefiles
===================================================================
--- trunk/cmake/epa_build/setup/setup_mingw_makefiles (rev 0)
+++ trunk/cmake/epa_build/setup/setup_mingw_makefiles 2014-01-04 22:38:22 UTC (rev 12917)
@@ -0,0 +1,42 @@
+# This script should be sourced from an MSYS bash environment. Its
+# purpose is to setup environment variables needed to run any standard
+# cmake "MinGW Makefiles" build on a Windows platform.
+
+source setup_mingw_msys_wine_toolchain
+
+# Tailor this install location for "MinGW Makefiles" builds to your local needs:
+export INSTALL_PREFIX=/z/home/wine/newstart/build_script/install-$WINEVERSION_mingw
+
+# End of tailored values.
+
+# Put buildtools that have been built and installed by build_packages on PATH.
+PATH=${INSTALL_PREFIX}_buildtools/bin:$PATH
+
+# Put install directory on PATH (so that, e.g., the wxwidgets
+# configuration tool will be found.
+PATH=${INSTALL_PREFIX}/bin:$PATH
+
+# Put appropriate buildtools areas on these.
+CMAKE_INCLUDE_PATH=${INSTALL_PREFIX}_buildtools/include:$CMAKE_INCLUDE_PATH
+CMAKE_LIBRARY_PATH=${INSTALL_PREFIX}_buildtools/lib:$CMAKE_LIBRARY_PATH
+
+# Put version 3 of itcl and friends higher on CMAKE_INCLUDE_PATH then
+# the above default.
+CMAKE_INCLUDE_PATH=${INSTALL_PREFIX}_buildtools/include/itcl3.4:$CMAKE_INCLUDE_PATH
+
+# Put appropriate install areas on these.
+CMAKE_INCLUDE_PATH=${INSTALL_PREFIX}/include:$CMAKE_INCLUDE_PATH
+CMAKE_LIBRARY_PATH=${INSTALL_PREFIX}/lib:$CMAKE_LIBRARY_PATH
+
+# Put install-location pkg-config directories at top of PKG_CONFIG_PATH
+PKG_CONFIG_PATH=$INSTALL_PREFIX/share/pkgconfig:$INSTALL_PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH
+
+# MAKE_COMMAND contains the appropriate make command for this generator.
+export MAKE_COMMAND=mingw32-make
+
+# Apparently the presence of sh.exe on the PATH is a signal to
+# mingw32-make.exe to use different (incorrect from the CMake point of
+# view) PATH processing. So make sure sh.exe is not on the PATH.
+PATH=$MINGW_PREFIX/msys/1.0/bin_without_sh/:$PATH
+
+export GENERATOR_STRING="MinGW Makefiles"
Modified: trunk/cmake/epa_build/setup/setup_msys_makefiles
===================================================================
--- trunk/cmake/epa_build/setup/setup_msys_makefiles 2013-12-31 18:06:30 UTC (rev 12916)
+++ trunk/cmake/epa_build/setup/setup_msys_makefiles 2014-01-04 22:38:22 UTC (rev 12917)
@@ -31,6 +31,9 @@
# Put install-location pkg-config directories at top of PKG_CONFIG_PATH
PKG_CONFIG_PATH=$INSTALL_PREFIX/share/pkgconfig:$INSTALL_PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH
+# MAKE_COMMAND contains the appropriate make command for this generator.
+export MAKE_COMMAND=make
+
# Put MSYS at the top of the PATH
PATH=$MINGW_PREFIX/msys/1.0/bin/:$PATH
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2014-01-06 20:41:57
|
Revision: 12922
http://sourceforge.net/p/plplot/code/12922
Author: airwin
Date: 2014-01-06 20:41:54 +0000 (Mon, 06 Jan 2014)
Log Message:
-----------
Rename setup_linux ==> setup_linux_makefiles
Added Paths:
-----------
trunk/cmake/epa_build/setup/setup_linux_makefiles
Removed Paths:
-------------
trunk/cmake/epa_build/setup/setup_linux
Deleted: trunk/cmake/epa_build/setup/setup_linux
===================================================================
--- trunk/cmake/epa_build/setup/setup_linux 2014-01-06 09:35:54 UTC (rev 12921)
+++ trunk/cmake/epa_build/setup/setup_linux 2014-01-06 20:41:54 UTC (rev 12922)
@@ -1,59 +0,0 @@
-# Source this file to setup a Linux build_packages build.
-
-# Tailor these values.
-
-# Put latest CMake on PATH
-PATH=/home/software/cmake/install/bin:$PATH
-
-export INSTALL_PREFIX=/home/wine/newstart/build_script/install-linux
-
-export EPA_BUILD_SOURCE_PATH=/home/software/plplot_svn/HEAD/plplot_allura/cmake/epa_build
-
-# gcc, g++, and gfortran flags you might want to tailor to different values.
-export CFLAGS='-O3 -fvisibility=hidden -Wuninitialized'
-export CXXFLAGS='-O3 -fvisibility=hidden -Wuninitialized'
-export FFLAGS='-O3 -Wuninitialized'
-
-# The debian gcj-4.7-jdk package (or its dependencies) has
-# some peculiar locations for java components so CMake needs
-# some help in finding those.
-export CMAKE_INCLUDE_PATH=/usr/lib/gcc/x86_64-linux-gnu/4.7/include
-export CMAKE_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu/gcj-4.7-13
-
-# In the past, CMake has needed help finding the Phobos library for D
-# for Debian stable. I am not sure this is necessary anymore with D2,
-# but it apparently does not hurt.
-CMAKE_LIBRARY_PATH=/usr/lib/gcc/x86_64-linux-gnu/4.6/:$CMAKE_LIBRARY_PATH
-
-# End of tailored values.
-
-# Put buildtools that have been built and installed by build_packages on PATH.
-PATH=${INSTALL_PREFIX}_buildtools/bin:$PATH
-
-# Put Linux install directory on PATH (so that, e.g., the wxwidgets
-# configuration tool will be found.
-PATH=${INSTALL_PREFIX}/bin:$PATH
-
-CMAKE_INCLUDE_PATH=${INSTALL_PREFIX}_buildtools/include:$CMAKE_INCLUDE_PATH
-CMAKE_LIBRARY_PATH=${INSTALL_PREFIX}_buildtools/lib:$CMAKE_LIBRARY_PATH
-
-# Put version 3 of itcl and friends higher on CMAKE_INCLUDE_PATH then
-# the above default.
-CMAKE_INCLUDE_PATH=${INSTALL_PREFIX}_buildtools/include/itcl3.4:$CMAKE_INCLUDE_PATH
-
-# Put appropriate install areas on these.
-CMAKE_INCLUDE_PATH=${INSTALL_PREFIX}/include:$CMAKE_INCLUDE_PATH
-CMAKE_LIBRARY_PATH=${INSTALL_PREFIX}/lib:$CMAKE_LIBRARY_PATH
-
-# Put buildtools pkg-config directories at top of PKG_CONFIG_PATH
-export PKG_CONFIG_PATH=${INSTALL_PREFIX}_buildtools/share/pkgconfig:${INSTALL_PREFIX}_buildtools/lib/pkgconfig
-
-# Put install-location pkg-config directories at top of PKG_CONFIG_PATH
-PKG_CONFIG_PATH=$INSTALL_PREFIX/share/pkgconfig:$INSTALL_PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH
-
-# As temporary measure also use system-installed *.pc files for dependencies
-# which are currently not built. Put these at the end of PKG_CONFIG_PATH
-# so they are only used as a last resort.
-PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/share/pkgconfig
-
-export GENERATOR_STRING="Unix Makefiles"
Copied: trunk/cmake/epa_build/setup/setup_linux_makefiles (from rev 12912, trunk/cmake/epa_build/setup/setup_linux)
===================================================================
--- trunk/cmake/epa_build/setup/setup_linux_makefiles (rev 0)
+++ trunk/cmake/epa_build/setup/setup_linux_makefiles 2014-01-06 20:41:54 UTC (rev 12922)
@@ -0,0 +1,59 @@
+# Source this file to setup a Linux build_packages build.
+
+# Tailor these values.
+
+# Put latest CMake on PATH
+PATH=/home/software/cmake/install/bin:$PATH
+
+export INSTALL_PREFIX=/home/wine/newstart/build_script/install-linux
+
+export EPA_BUILD_SOURCE_PATH=/home/software/plplot_svn/HEAD/plplot_allura/cmake/epa_build
+
+# gcc, g++, and gfortran flags you might want to tailor to different values.
+export CFLAGS='-O3 -fvisibility=hidden -Wuninitialized'
+export CXXFLAGS='-O3 -fvisibility=hidden -Wuninitialized'
+export FFLAGS='-O3 -Wuninitialized'
+
+# The debian gcj-4.7-jdk package (or its dependencies) has
+# some peculiar locations for java components so CMake needs
+# some help in finding those.
+export CMAKE_INCLUDE_PATH=/usr/lib/gcc/x86_64-linux-gnu/4.7/include
+export CMAKE_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu/gcj-4.7-13
+
+# In the past, CMake has needed help finding the Phobos library for D
+# for Debian stable. I am not sure this is necessary anymore with D2,
+# but it apparently does not hurt.
+CMAKE_LIBRARY_PATH=/usr/lib/gcc/x86_64-linux-gnu/4.6/:$CMAKE_LIBRARY_PATH
+
+# End of tailored values.
+
+# Put buildtools that have been built and installed by build_packages on PATH.
+PATH=${INSTALL_PREFIX}_buildtools/bin:$PATH
+
+# Put Linux install directory on PATH (so that, e.g., the wxwidgets
+# configuration tool will be found.
+PATH=${INSTALL_PREFIX}/bin:$PATH
+
+CMAKE_INCLUDE_PATH=${INSTALL_PREFIX}_buildtools/include:$CMAKE_INCLUDE_PATH
+CMAKE_LIBRARY_PATH=${INSTALL_PREFIX}_buildtools/lib:$CMAKE_LIBRARY_PATH
+
+# Put version 3 of itcl and friends higher on CMAKE_INCLUDE_PATH then
+# the above default.
+CMAKE_INCLUDE_PATH=${INSTALL_PREFIX}_buildtools/include/itcl3.4:$CMAKE_INCLUDE_PATH
+
+# Put appropriate install areas on these.
+CMAKE_INCLUDE_PATH=${INSTALL_PREFIX}/include:$CMAKE_INCLUDE_PATH
+CMAKE_LIBRARY_PATH=${INSTALL_PREFIX}/lib:$CMAKE_LIBRARY_PATH
+
+# Put buildtools pkg-config directories at top of PKG_CONFIG_PATH
+export PKG_CONFIG_PATH=${INSTALL_PREFIX}_buildtools/share/pkgconfig:${INSTALL_PREFIX}_buildtools/lib/pkgconfig
+
+# Put install-location pkg-config directories at top of PKG_CONFIG_PATH
+PKG_CONFIG_PATH=$INSTALL_PREFIX/share/pkgconfig:$INSTALL_PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH
+
+# As temporary measure also use system-installed *.pc files for dependencies
+# which are currently not built. Put these at the end of PKG_CONFIG_PATH
+# so they are only used as a last resort.
+PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/share/pkgconfig
+
+export GENERATOR_STRING="Unix Makefiles"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2014-01-06 20:51:41
|
Revision: 12923
http://sourceforge.net/p/plplot/code/12923
Author: airwin
Date: 2014-01-06 20:51:38 +0000 (Mon, 06 Jan 2014)
Log Message:
-----------
Implement the BUILD_COMMAND variable which is a variable that
contains the name of the correct build command for the generator.
Drop MAKE_COMMAND if it has been implemented. I prefer the variable
name BUILD_COMMAND instead because some generators (e.g., ninja) use a
build command that has nothing to do with make.
Modified Paths:
--------------
trunk/cmake/epa_build/setup/setup_linux_makefiles
trunk/cmake/epa_build/setup/setup_mingw_makefiles
trunk/cmake/epa_build/setup/setup_msys_makefiles
Modified: trunk/cmake/epa_build/setup/setup_linux_makefiles
===================================================================
--- trunk/cmake/epa_build/setup/setup_linux_makefiles 2014-01-06 20:41:54 UTC (rev 12922)
+++ trunk/cmake/epa_build/setup/setup_linux_makefiles 2014-01-06 20:51:38 UTC (rev 12923)
@@ -56,4 +56,7 @@
# so they are only used as a last resort.
PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/share/pkgconfig
+# BUILD_COMMAND contains the appropriate build command for this generator.
+export BUILD_COMMAND=make
+
export GENERATOR_STRING="Unix Makefiles"
Modified: trunk/cmake/epa_build/setup/setup_mingw_makefiles
===================================================================
--- trunk/cmake/epa_build/setup/setup_mingw_makefiles 2014-01-06 20:41:54 UTC (rev 12922)
+++ trunk/cmake/epa_build/setup/setup_mingw_makefiles 2014-01-06 20:51:38 UTC (rev 12923)
@@ -31,8 +31,9 @@
# Put install-location pkg-config directories at top of PKG_CONFIG_PATH
PKG_CONFIG_PATH=$INSTALL_PREFIX/share/pkgconfig:$INSTALL_PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH
-# MAKE_COMMAND contains the appropriate make command for this generator.
-export MAKE_COMMAND=mingw32-make
+# BUILD_COMMAND contains the appropriate build command for this generator.
+export BUILD_COMMAND=make
+export BUILD_COMMAND=mingw32-make
# Apparently the presence of sh.exe on the PATH is a signal to
# mingw32-make.exe to use different (incorrect from the CMake point of
Modified: trunk/cmake/epa_build/setup/setup_msys_makefiles
===================================================================
--- trunk/cmake/epa_build/setup/setup_msys_makefiles 2014-01-06 20:41:54 UTC (rev 12922)
+++ trunk/cmake/epa_build/setup/setup_msys_makefiles 2014-01-06 20:51:38 UTC (rev 12923)
@@ -31,8 +31,8 @@
# Put install-location pkg-config directories at top of PKG_CONFIG_PATH
PKG_CONFIG_PATH=$INSTALL_PREFIX/share/pkgconfig:$INSTALL_PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH
-# MAKE_COMMAND contains the appropriate make command for this generator.
-export MAKE_COMMAND=make
+# BUILD_COMMAND contains the appropriate build command for this generator.
+export BUILD_COMMAND=make
# Put MSYS at the top of the PATH
PATH=$MINGW_PREFIX/msys/1.0/bin/:$PATH
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X