|
From: <ai...@us...> - 2013-12-01 02:04:21
|
Revision: 12787
http://sourceforge.net/p/plplot/code/12787
Author: airwin
Date: 2013-12-01 02:04:10 +0000 (Sun, 01 Dec 2013)
Log Message:
-----------
Replace build_projects and BUILD_PROJECTS everywhere with epa_build
and EPA_BUILD.
Modified Paths:
--------------
trunk/cmake/epa_build/CMakeLists.txt
trunk/cmake/epa_build/README
trunk/cmake/epa_build/gtk_transform.py
trunk/cmake/epa_build/plplot/bp.cmake
trunk/cmake/epa_build/setup/setup_linux
Modified: trunk/cmake/epa_build/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/CMakeLists.txt 2013-12-01 02:01:49 UTC (rev 12786)
+++ trunk/cmake/epa_build/CMakeLists.txt 2013-12-01 02:04:10 UTC (rev 12787)
@@ -18,7 +18,7 @@
# License along with this file; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-project(build_projects NONE)
+project(epa_build NONE)
message(STATUS "CMake version = ${CMAKE_VERSION}")
message(STATUS "CMAKE_SYSTEM = ${CMAKE_SYSTEM}")
@@ -27,11 +27,11 @@
cmake_minimum_required(VERSION 2.8.11.2 FATAL_ERROR)
-set(EP_BASE ${CMAKE_BINARY_DIR}/build_projects)
+set(EP_BASE ${CMAKE_BINARY_DIR}/epa_build)
message(STATUS "EP_BASE = ${EP_BASE}")
set_directory_properties(PROPERTIES EP_BASE ${EP_BASE})
-# Set build_projects variables to control builds in general
+# Set epa_build variables to control builds in general
# Test whether there is access to the MSYS platform on the PATH. Note
# this is a different question than whether you are using the "MSYS
@@ -58,14 +58,14 @@
message(STATUS "CYGWIN = ${CYGWIN}")
if(CYGWIN)
- message(FATAL_ERROR "build_projects does not work correctly on the Cygwin platform. Use the MinGW compiler and MSYS platform instead.")
+ message(FATAL_ERROR "epa_build does not work correctly on the Cygwin platform. Use the MinGW compiler and MSYS platform instead.")
endif(CYGWIN)
if(WIN32 AND NOT MSYS_PLATFORM)
- message(FATAL_ERROR "build_projects does not work correctly on Windows without the MSYS platform. Install the MSYS platform (perhaps without sh.exe depending on CMake generator) on Windows.")
+ message(FATAL_ERROR "epa_build does not work correctly on Windows without the MSYS platform. Install the MSYS platform (perhaps without sh.exe depending on CMake generator) on Windows.")
endif(WIN32 AND NOT MSYS_PLATFORM)
-# List of executables required by build_projects CMake logic.
+# List of executables required by epa_build CMake logic.
set(executables_LIST
# ExternalProject workarounds
touch
@@ -77,7 +77,7 @@
patch
# General
env
- # Not specifically required by build_projects (yet), but some
+ # Not specifically required by epa_build (yet), but some
# individual project configurations will not work unless this is
# available so might as well check it here.
bash
@@ -96,7 +96,7 @@
if(MSYS_PLATFORM)
message(STATUS "${executable} missing from your MSYS platform. Use mingw-get to install it.")
endif(MSYS_PLATFORM)
- message(FATAL_ERROR "${executable} must be on your PATH in order for build_projects to work correctly")
+ message(FATAL_ERROR "${executable} must be on your PATH in order for epa_build to work correctly")
endif(NOT ${EXECUTABLE}_EXECUTABLE)
endforeach(executable ${executables_LIST})
@@ -242,8 +242,8 @@
message(STATUS "BP_PARALLEL_CTEST_COMMAND = ${BP_PARALLEL_CTEST_COMMAND}")
# Put ${CMAKE_INSTALL_PREFIX}/bin on the PATH as well for those cases
-# where some executable built and installed by build_projects needs
-# to be found by another project being configured by build_projects.
+# where some executable built and installed by epa_build needs
+# to be found by another project being configured by epa_build.
if(MSYS_PLATFORM)
set(BP_ORIGINAL_NATIVE_PATH "$ENV{PATH};${CMAKE_INSTALL_PREFIX}/bin")
else(MSYS_PLATFORM)
@@ -278,7 +278,7 @@
if(MSYS_PLATFORM)
message(STATUS "${executable} missing from your MSYS platform. If sh is missing, use a generator other than 'MinGW Makefiles'. If something else is missing use mingw-get to install it.")
endif(MSYS_PLATFORM)
- message(FATAL_ERROR "${executable} must be on your PATH in order for build_projects to work correctly")
+ message(FATAL_ERROR "${executable} must be on your PATH in order for epa_build to work correctly")
endif(NOT ${EXECUTABLE}_EXECUTABLE)
endforeach(executable ${executables_LIST})
Modified: trunk/cmake/epa_build/README
===================================================================
--- trunk/cmake/epa_build/README 2013-12-01 02:01:49 UTC (rev 12786)
+++ trunk/cmake/epa_build/README 2013-12-01 02:04:10 UTC (rev 12787)
@@ -96,7 +96,7 @@
1. Linux
Note that setup_linux sets up all the important environment variables you
-need including GENERATOR_STRING, INSTALL_PREFIX, and BUILD_PROJECTS_SOURCE_PATH.
+need including GENERATOR_STRING, INSTALL_PREFIX, and EPA_BUILD_SOURCE_PATH.
A. [OPTIONAL] build necessary additional buildtools whose versions you
prefer compared to the versions available on your Linux distro.
@@ -108,7 +108,7 @@
rm -rf <Build tree prefix>/build_dir-linux_buildtools/* ${INSTALL_PREFIX}_buildtools
cd <Build tree prefix>/build_dir-linux_buildtools
-cmake -DCMAKE_VERBOSE_MAKEFILE=ON -G"$GENERATOR_STRING" -DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}_buildtools -DBUILD_THE_BUILDTOOLS=ON $BUILD_PROJECTS_SOURCE_PATH >& cmake.out
+cmake -DCMAKE_VERBOSE_MAKEFILE=ON -G"$GENERATOR_STRING" -DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}_buildtools -DBUILD_THE_BUILDTOOLS=ON $EPA_BUILD_SOURCE_PATH >& cmake.out
# Check cmake.out for any errors
less cmake.out
@@ -135,7 +135,7 @@
rm -rf <Build tree prefix>/build_dir-linux/* ${INSTALL_PREFIX}
cd <Build tree prefix>/build_dir-linux
-cmake -DCMAKE_VERBOSE_MAKEFILE=ON -G"$GENERATOR_STRING" -DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX} $BUILD_PROJECTS_SOURCE_PATH >& cmake.out
+cmake -DCMAKE_VERBOSE_MAKEFILE=ON -G"$GENERATOR_STRING" -DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX} $EPA_BUILD_SOURCE_PATH >& cmake.out
# Check cmake.out for any errors
less cmake.out
Modified: trunk/cmake/epa_build/gtk_transform.py
===================================================================
--- trunk/cmake/epa_build/gtk_transform.py 2013-12-01 02:01:49 UTC (rev 12786)
+++ trunk/cmake/epa_build/gtk_transform.py 2013-12-01 02:04:10 UTC (rev 12787)
@@ -2,7 +2,7 @@
# Read gtk jhbuild xml module that has been produced by
# gtk_xml_recursive_process.py from stdin and transform it into data
-# required for build_projects using the ElementTree XML API.
+# required for epa_build using the ElementTree XML API.
# Copyright (C) 2013 Alan W. Irwin
Modified: trunk/cmake/epa_build/plplot/bp.cmake
===================================================================
--- trunk/cmake/epa_build/plplot/bp.cmake 2013-12-01 02:01:49 UTC (rev 12786)
+++ trunk/cmake/epa_build/plplot/bp.cmake 2013-12-01 02:04:10 UTC (rev 12787)
@@ -91,12 +91,12 @@
#endif(PREFER_DOWNLOAD)
# Assumption that the top-level local PLplot source tree is two directories
-# up from the present top-level directory for build_projects.
-# This assumption is correct if you are accessing build_projects as
+# up from the present top-level directory for epa_build.
+# This assumption is correct if you are accessing epa_build as
# a subset of the PLplot source tree so that its location is in
-# cmake/build_projects within that source tree.
+# cmake/epa_build within that source tree.
# But it is not the case if you have independently
-# checked out just the build_projects subset of the normal PLplot source
+# checked out just the epa_build subset of the normal PLplot source
# tree so check that the result really is a plplot source tree.
get_filename_component(PLPLOT_LOCAL_SOURCE_DIR ${CMAKE_SOURCE_DIR} PATH)
get_filename_component(PLPLOT_LOCAL_SOURCE_DIR ${PLPLOT_LOCAL_SOURCE_DIR} PATH)
@@ -106,7 +106,7 @@
)
if(NOT IS_PLPLOT_SOURCE_TREE)
- message(FATAL_ERROR "build_projects not located in cmake/build_projects in a PLplot source tree")
+ message(FATAL_ERROR "epa_build not located in cmake/epa_build in a PLplot source tree")
endif(NOT IS_PLPLOT_SOURCE_TREE)
set(tags "" "_lite")
Modified: trunk/cmake/epa_build/setup/setup_linux
===================================================================
--- trunk/cmake/epa_build/setup/setup_linux 2013-12-01 02:01:49 UTC (rev 12786)
+++ trunk/cmake/epa_build/setup/setup_linux 2013-12-01 02:04:10 UTC (rev 12787)
@@ -7,7 +7,7 @@
export INSTALL_PREFIX=/home/wine/newstart/build_script/install-linux
-export BUILD_PROJECTS_SOURCE_PATH=/home/software/plplot_svn/HEAD/plplot_allura/cmake/build_projects
+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'
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|