Changeset 2089 for branches/casa-prerelease

Timestamp:

04/01/11 14:05:04 (14 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Merge changes in trunk (r2088).

Location:

branches/casa-prerelease/pre-asap

Files:

• . (modified) (1 prop)
• CMakeLists.txt (modified) (1 diff)
• Makefile (modified) (1 prop)
• SConstruct (modified) (1 prop)
• apps (modified) (1 prop)
• cmake/exec_getsvnrev.sh (copied) (copied from trunk/cmake/exec_getsvnrev.sh )
• external-alma (modified) (1 prop)
• external-alma/atnf/pks/pks_maths.cc (modified) (1 prop)
• getsvnrev.sh (modified) (1 prop)
• python (modified) (1 prop)
• src (modified) (1 prop)
• src/SConscript (modified) (1 prop)

branches/casa-prerelease/pre-asap/CMakeLists.txt

@@ -515 +515 @@
 set( PYTHON_INSTALL_DIR python/${PYTHONV}/asap )
 set( SHARED_INSTALL_DIR share/asap )
+
+#
+# execute getsvnrev.sh to create/update svninfo.txt
+# run chmod to make sure the script has executable 
+#
+exec_program( chmod ARGS a+x ${ASAP_SOURCE_DIR}/getsvnrev.sh )
+exec_program( chmod ARGS a+x ${ASAP_SOURCE_DIR}/cmake/exec_getsvnrev.sh )
+exec_program( ${ASAP_SOURCE_DIR}/cmake/exec_getsvnrev.sh ARGS ${ASAP_SOURCE_DIR})
+
 # Add the modules to be built.
 #