From 0258a0fd90b504f1124ec681f09fbdcb6f28af2e Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Wed, 14 Jul 2010 19:50:21 +0000 Subject: [PATCH] * All Tools: - Change: Switch from "goodies" to "bootstrap". --- bootstrap/CMakeLists.txt | 2 +- bootstrap/buildCoriolis.py | 80 +++++++++---------- bootstrap/cmake_modules/CMakeLists.txt | 2 +- ...{FindGoodies.cmake => FindBootstrap.cmake} | 0 4 files changed, 42 insertions(+), 42 deletions(-) rename bootstrap/cmake_modules/{FindGoodies.cmake => FindBootstrap.cmake} (100%) diff --git a/bootstrap/CMakeLists.txt b/bootstrap/CMakeLists.txt index abe8cfae..07fbfbf6 100644 --- a/bootstrap/CMakeLists.txt +++ b/bootstrap/CMakeLists.txt @@ -1,5 +1,5 @@ - project ( Goodies ) + project ( Bootstrap ) cmake_minimum_required ( VERSION 2.4.0 ) diff --git a/bootstrap/buildCoriolis.py b/bootstrap/buildCoriolis.py index e63d7c63..c1aaca68 100755 --- a/bootstrap/buildCoriolis.py +++ b/bootstrap/buildCoriolis.py @@ -114,11 +114,11 @@ class ProjectBuilder: if self._enableShared == "ON": self._libMode = "Shared" else: self._libMode = "Static" - self._specFileIn = os.path.join ( self._sourceDir, "goodies", "coriolis2.spec.in" ) - self._specFile = os.path.join ( self._sourceDir, "goodies", "coriolis2.spec" ) + self._specFileIn = os.path.join ( self._sourceDir, "bootstrap", "coriolis2.spec.in" ) + self._specFile = os.path.join ( self._sourceDir, "bootstrap", "coriolis2.spec" ) self._sourceTarBz2 = "coriolis2-1.0.%s.tar.bz2" % self._svnTag self._binaryTarBz2 = "coriolis2-binary-1.0.%s-1.el5_soc.tar.bz2" % self._svnTag - self._distribPatch = os.path.join ( self._sourceDir, "goodies", "coriolis2-for-distribution.patch" ) + self._distribPatch = os.path.join ( self._sourceDir, "bootstrap", "coriolis2-for-distribution.patch" ) return @@ -516,44 +516,44 @@ class ProjectBuilder: if __name__ == "__main__": - goodies = Project ( name = "goodies" - , tools =[ "goodies" ] - , repository="/users/outil/coriolis/svn" - ) + bootstrap = Project ( name = "bootstrap" + , tools =[ "bootstrap" ] + , repository="/users/outil/coriolis/svn" + ) - vlsisapd = Project ( name = "vlsisapd" - , tools =[ "vlsisapd" ] - , repository="/users/outil/coriolis/svn" - ) + vlsisapd = Project ( name = "vlsisapd" + , tools =[ "vlsisapd" ] + , repository="/users/outil/coriolis/svn" + ) - coriolis = Project ( name = "coriolis" - , tools =[ "hurricane" - , "crlcore" - , "nimbus" - , "metis" - , "mauka" - , "knik" - , "katabatic" - , "kite" - , "equinox" - , "solstice" - , "unicorn" - , "ispd" - , "cumulus" - , "stratus1" - ] - , repository="/users/outil/coriolis/svn" - ) - chams = Project ( name = "chams" - , tools =[ "hurricaneAMS" - , "amsCore" - , "opSim" - , "scribe" - , "pharos" - , "schematic" - ] - , repository="/users/outil/chams/svn" - ) + coriolis = Project ( name = "coriolis" + , tools =[ "hurricane" + , "crlcore" + , "nimbus" + , "metis" + , "mauka" + , "knik" + , "katabatic" + , "kite" + , "equinox" + , "solstice" + , "unicorn" + , "ispd" + , "cumulus" + , "stratus1" + ] + , repository="/users/outil/coriolis/svn" + ) + chams = Project ( name = "chams" + , tools =[ "hurricaneAMS" + , "amsCore" + , "opSim" + , "scribe" + , "pharos" + , "schematic" + ] + , repository="/users/outil/chams/svn" + ) parser = optparse.OptionParser () # Build relateds. @@ -584,7 +584,7 @@ if __name__ == "__main__": ( options, args ) = parser.parse_args () builder = ProjectBuilder () - builder.register ( goodies ) + builder.register ( bootstrap ) builder.register ( vlsisapd ) builder.register ( coriolis ) builder.register ( chams ) diff --git a/bootstrap/cmake_modules/CMakeLists.txt b/bootstrap/cmake_modules/CMakeLists.txt index e124699e..245e83bb 100644 --- a/bootstrap/cmake_modules/CMakeLists.txt +++ b/bootstrap/cmake_modules/CMakeLists.txt @@ -2,7 +2,7 @@ set ( finders FindFLEX.cmake FindBISON.cmake FindPythonSitePackages.cmake - FindGoodies.cmake + FindBootstrap.cmake ) install ( FILES ${finders} DESTINATION share/cmake/Modules ) diff --git a/bootstrap/cmake_modules/FindGoodies.cmake b/bootstrap/cmake_modules/FindBootstrap.cmake similarity index 100% rename from bootstrap/cmake_modules/FindGoodies.cmake rename to bootstrap/cmake_modules/FindBootstrap.cmake