certi-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[certi-cvs] certi CMakeLists.txt scripts/CMakeLists.txt scr...


From: certi-cvs
Subject: [certi-cvs] certi CMakeLists.txt scripts/CMakeLists.txt scr...
Date: Thu, 24 Jun 2010 13:19:16 +0000

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      10/06/24 13:19:16

Modified files:
        .              : CMakeLists.txt 
Added files:
        scripts        : CMakeLists.txt myCERTI_env.sh.in 
                         myCERTI_env.csh.in 
Removed files:
        .              : myCERTI_env.sh.in myCERTI_env.csh.in 

Log message:
        - Move all scripts in scripts subdir, modify main CMakeLists.txt 
accordingly and create a new scripts/CMakeLists.txt
        
        - Add some optional CMake target for 
            * regenerating CERTI [Network] Message from spec
            * generating Message Generator doc with epydoc

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/CMakeLists.txt?cvsroot=certi&r1=1.81&r2=1.82
http://cvs.savannah.gnu.org/viewcvs/certi/myCERTI_env.sh.in?cvsroot=certi&r1=1.6&r2=0
http://cvs.savannah.gnu.org/viewcvs/certi/myCERTI_env.csh.in?cvsroot=certi&r1=3.4&r2=0
http://cvs.savannah.gnu.org/viewcvs/certi/scripts/CMakeLists.txt?cvsroot=certi&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/certi/scripts/myCERTI_env.sh.in?cvsroot=certi&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/certi/scripts/myCERTI_env.csh.in?cvsroot=certi&rev=1.1

Patches:
Index: CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/CMakeLists.txt,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -b -r1.81 -r1.82
--- CMakeLists.txt      23 Jan 2010 17:12:47 -0000      1.81
+++ CMakeLists.txt      24 Jun 2010 13:19:16 -0000      1.82
@@ -347,6 +347,7 @@
 ADD_SUBDIRECTORY( libRTI )
 ADD_SUBDIRECTORY( test )
 ADD_SUBDIRECTORY( doc )
+ADD_SUBDIRECTORY( scripts )
 
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "CERTI An efficient Open Source HLA 
RunTime Infrastructure")
 SET(CPACK_PACKAGE_VENDOR "ONERA/DTIM")
@@ -439,22 +440,6 @@
   ADD_DEBIAN_TARGETS(certi)
 ENDIF(DEBIAN_FOUND)
 
-########### install files ###############
-SET(prefix ${CMAKE_INSTALL_PREFIX})
-SET(configure_input "Generated by CMake.")
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/myCERTI_env.sh.in
-  ${CMAKE_CURRENT_BINARY_DIR}/myCERTI_env.sh @ONLY)
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/myCERTI_env.csh.in
-  ${CMAKE_CURRENT_BINARY_DIR}/myCERTI_env.csh @ONLY)
-
-INSTALL(FILES
-  ${CMAKE_CURRENT_BINARY_DIR}/myCERTI_env.sh
-  ${CMAKE_CURRENT_BINARY_DIR}/myCERTI_env.csh
-  ${CMAKE_CURRENT_SOURCE_DIR}/scripts/FindCERTI.cmake
-  ${CMAKE_CURRENT_SOURCE_DIR}/scripts/UseCERTI.cmake
-  ${CMAKE_CURRENT_SOURCE_DIR}/scripts/FindRTI.cmake
-  DESTINATION share/scripts)
-
  ## Patch generating target
 # The custom target is using a cmake script which in turn
 # use execute_process,

Index: scripts/CMakeLists.txt
===================================================================
RCS file: scripts/CMakeLists.txt
diff -N scripts/CMakeLists.txt
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ scripts/CMakeLists.txt      24 Jun 2010 13:19:16 -0000      1.1
@@ -0,0 +1,71 @@
+##################################################################
+# scripts provided by CERTI
+# This directory contains some scripts 
+# (shell, python, CMake, ...)
+# which may be useful for working with CERTI.
+##################################################################
+
+########### Configure and install some scripts files #############
+SET(prefix ${CMAKE_INSTALL_PREFIX})
+SET(configure_input "Generated by CMake.")
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/myCERTI_env.sh.in
+  ${CMAKE_CURRENT_BINARY_DIR}/myCERTI_env.sh @ONLY)
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/myCERTI_env.csh.in
+  ${CMAKE_CURRENT_BINARY_DIR}/myCERTI_env.csh @ONLY)
+
+INSTALL(FILES
+  ${CMAKE_CURRENT_BINARY_DIR}/myCERTI_env.sh
+  ${CMAKE_CURRENT_BINARY_DIR}/myCERTI_env.csh
+  FindCERTI.cmake
+  UseCERTI.cmake
+  FindRTI.cmake
+  DESTINATION share/scripts)
+
+########### Message Generator sources and input ##################
+set(MESSAGE_GENERATOR_SRC
+    GenerateMessages.py
+    GenMsgBase.py
+    GenMsgAST.py
+    GenMsgCXX.py
+    GenMsgJava.py
+    GenMsgPython.py)    
+    
+set(MESSAGE_SPEC_FILES
+    CERTI_Message.msg
+    CERTI_NetworkMessage.msg)
+  
+############ Discover Python environment (if any) ################   
+find_package(PythonInterp)
+#find_package(PythonLibs)
+
+# If we found python interpreter we may define some rules to:
+#   - Re-Generate CERTI [Network]Message classes
+#   - Generate epydoc documentation for the message generator 
+if (PYTHONINTERP_FOUND)
+    add_custom_target(RegenCERTIMsg   
+       COMMAND ${PYTHON_EXECUTABLE} GenerateMessages.py 
--input=CERTI_NetworkMessage.msg --language=CXXCERTINetworkMessage 
--type=header --output=${PROJECT_SOURCE_DIR}/libCERTI/NM_Classes.hh
+       COMMAND ${PYTHON_EXECUTABLE} GenerateMessages.py 
--input=CERTI_NetworkMessage.msg --language=CXXCERTINetworkMessage --type=body 
--output=${PROJECT_SOURCE_DIR}/libCERTI/NM_Classes.cc
+       COMMAND ${PYTHON_EXECUTABLE} GenerateMessages.py 
--input=CERTI_Message.msg --language=CXXCERTIMessage --type=header 
--output=${PROJECT_SOURCE_DIR}/libCERTI/M_Classes.hh
+       COMMAND ${PYTHON_EXECUTABLE} GenerateMessages.py 
--input=CERTI_Message.msg --language=CXXCERTIMessage --type=body 
--output=${PROJECT_SOURCE_DIR}/libCERTI/M_Classes.cc     
+       DEPENDS ${MESSAGE_SPEC_FILES} ${MESSAGE_GENERATOR_SRC}  
+       WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} 
+       COMMENT "Regenerate CERTI Message and Network Message classes from 
specification (CERTI must be recompiled just after that)"   
+       )
+   
+    # add a rule for epydoc if it is found
+    find_program(EPYDOC_EXECUTABLE epydoc)
+    if (EPYDOC_EXECUTABLE)   
+        add_custom_target(GenGenMessageDocPDF
+           ${CMAKE_COMMAND} -E make_directory 
${PROJECT_BINARY_DIR}/doc/MsgGen/pdf
+           COMMAND ${EPYDOC_EXECUTABLE} --pdf 
--output=${PROJECT_BINARY_DIR}/doc/MsgGen/pdf --name="CERTI-Message-Generator" 
${MESSAGE_GENERATOR_SRC}           
+           WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} 
+           COMMENT "Generate CERTI Message generator documentation (PDF) with 
epydoc"   
+           )
+        add_custom_target(GenGenMessageDocHTML
+           ${CMAKE_COMMAND} -E make_directory 
${PROJECT_BINARY_DIR}/doc/MsgGen/html
+           COMMAND ${EPYDOC_EXECUTABLE} --html 
--output=${PROJECT_BINARY_DIR}/doc/MsgGen/html --name="CERTI-Message-Generator" 
${MESSAGE_GENERATOR_SRC}           
+           WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} 
+           COMMENT "Generate CERTI Message generator documentation (PDF) with 
epydoc"   
+           )        
+    endif (EPYDOC_EXECUTABLE)
+endif (PYTHONINTERP_FOUND)
\ No newline at end of file

Index: scripts/myCERTI_env.sh.in
===================================================================
RCS file: scripts/myCERTI_env.sh.in
diff -N scripts/myCERTI_env.sh.in
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ scripts/myCERTI_env.sh.in   24 Jun 2010 13:19:16 -0000      1.1
@@ -0,0 +1,86 @@
+#!/bin/sh
+# @configure_input@
+
+export CERTI_VERSION="@PACKAGE_VERSION@"
+echo "CERTI version <$CERTI_VERSION>"
+
+# 1 : shell verification
+MYSHELL=`basename $SHELL`
+case $MYSHELL in
+    sh)   ;;
+       bash) ;;
+       zsh)  ;;
+       ksh)  ;;
+       *) 
+        echo "You may not be using a bourne shell, please use myCERTI.csh"
+        exit
+        ;;
+esac
+
+# 2 CERTI_HOST (i.e. where rtig runs)
+
+if [ $# -gt 0 ];
+then
+   export CERTI_HOST=$1
+else
+   export CERTI_HOST=localhost
+fi
+
+# 3 Architecture (i.e 32 or 64 bits)
+
+ARCH=`uname -m`
+#if [ "$ARCH" = "i686" ];
+#then
+#  NBITS="32bits"
+#else
+# NBITS="64bits"
+#fi
+echo "Current machine architecture is <$ARCH>".
+# assumed to be $NBITS"
+
+# 4 CERTI_HOME (i.e. where we find bin,lib,share,include about CERTI built)
+export address@hidden@
+alias go_certi_home='pushd $CERTI_HOME'
+
+# 5 CERTI_FED (i.e. where we find (default) FED files
+export CERTI_FED=$CERTI_HOME/share/federations
+alias go_certi_fed='pushd $CERTI_FED'
+
+# 6 PATH (i.e. to run easily rtig and s.o.)
+# Not PATH is not modified
+# if to be added PATH is already there
+MOREPATHBIN=$CERTI_HOME/bin
+MODIFPATH=`echo $PATH | grep $MOREPATHBIN`
+if [ -z "$MODIFPATH" ];
+then
+       export PATH=$MOREPATHBIN:$PATH
+       echo "Your PATH variable has been modified for bin"
+fi
+MOREPATHSCRIPTS=$CERTI_HOME/share/scripts
+MODIFPATH=`echo $PATH | grep $MOREPATHSCRIPTS`
+if [ -z "$MODIFPATH" ];
+then
+       export PATH=$MOREPATHSCRIPTS:$PATH
+       echo "Your PATH variable has been modified for scripts"
+fi
+
+# 7 LD_LIBRARY_PATH ( applications needs...)
+# Note LD_LIBRARY_PATH has to be extended sometimes
+MOREPATHLIB=$CERTI_HOME/lib
+MODIFPATH=`echo $LD_LIBRARY_PATH | grep $MOREPATHLIB`
+if [ -z "$MODIFPATH" ];
+then
+    export LD_LIBRARY_PATH=$MOREPATHLIB:$LD_LIBRARY_PATH
+fi
+
+echo "=========================================================="
+echo "** WARNING ** We hope you have made source myCERTI.sh **"
+echo "                                    ------"
+echo "If yes your variables for CERTI are now :"
+echo "CERTI_HOST      = " $CERTI_HOST
+echo "CERTI_HOME      = " $CERTI_HOME
+echo "CERTI_FED       = " $CERTI_FED
+echo "PATH            = " $PATH
+echo "LD_LIBRARY_PATH = " $LD_LIBRARY_PATH
+
+

Index: scripts/myCERTI_env.csh.in
===================================================================
RCS file: scripts/myCERTI_env.csh.in
diff -N scripts/myCERTI_env.csh.in
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ scripts/myCERTI_env.csh.in  24 Jun 2010 13:19:16 -0000      1.1
@@ -0,0 +1,80 @@
+#!/bin/csh
+# @configure_input@
+
+setenv CERTI_VERSION "@PACKAGE_VERSION@"
+echo "CERTI version <$CERTI_VERSION>"
+
+# 1 : shell verification
+
+setenv MONSHELL `echo $SHELL | cut -d '/' -f3`
+if ( $MONSHELL != "csh" && $MONSHELL != "tcsh" ) then
+  echo "You are not in CShell ($SHELL), please use myCERTI.sh."
+  exit
+endif
+
+# 2 CERTI_HOST (i.e. where rtig runs)
+
+if ( $# == "1") then
+   setenv CERTI_HOST $1
+else
+   setenv CERTI_HOST localhost
+endif
+
+# 3 Architecture (i.e 32 or 64 bits)
+
+setenv ARCH `uname -m`
+#if ( $ARCH == "x86_64" ) then
+#    setenv NBITS 64
+#else
+#    setenv NBITS 32
+#endif
+echo "Current machine architecture is <$ARCH>."
+# assumed to be $NBITS bits."
+
+# 4 CERTI_HOME (i.e. where we find bin,lib,share,include about CERTI built)
+setenv CERTI_HOME @prefix@
+alias go_certi_home='pushd $CERTI_HOME'
+
+# 5 CERTI_FED (i.e. where we find (default) FED files
+setenv CERTI_FED $CERTI_HOME/share/federations
+alias go_certi_fed='pushd $CERTI_FED'
+
+# 6 PATH (i.e. to run easily rtig and s.o.)
+# Note sometimes PATH is not modified
+setenv MOREPATHBIN "$CERTI_HOME/bin"
+setenv MODIFPATH `echo $PATH | grep $MOREPATHBIN`
+if ( $MODIFPATH == "" ) then    
+    setenv PATH $MOREPATHBIN":"$PATH
+    echo "Your PATH variable has been modified for bin"
+endif
+setenv MOREPATHSCRIPTS "$CERTI_HOME/share/scripts"
+setenv MODIFPATH `echo $PATH | grep $MOREPATHSCRIPTS`
+if ( $MODIFPATH == "" ) then    
+    setenv PATH $MOREPATHSCRIPTS":"$PATH
+    echo "Your PATH variable has been modified for scripts"
+endif
+
+# 7 LD_LIBRARY_PATH ( applications needs...)
+# Note LD_LIBRARY_PATH has to be extended sometimes
+if ( $?LD_LIBRARY_PATH ) then
+    setenv MOREPATHLIB "$CERTI_HOME/lib"
+    setenv MODIFPATH `echo $LD_LIBRARY_PATH | grep $MOREPATHLIB`
+    if ( $MODIFPATH == "" ) then
+        setenv LD_LIBRARY_PATH $MOREPATHLIB":"$LD_LIBRARY_PATH
+        echo "Your LD_LIBRARY_PATH variable has been extended."
+    endif
+else
+    setenv LD_LIBRARY_PATH $CERTI_HOME/lib
+endif
+
+echo "=========================================================="
+echo "** WARNING ** We hope you have made source myCERTI.tcsh **"
+echo "                                    ------"
+echo "If yes your variables for CERTI are now :"
+echo "CERTI_HOST      = " $CERTI_HOST
+echo "CERTI_HOME      = " $CERTI_HOME
+echo "CERTI_FED       = " $CERTI_FED
+echo "PATH            = " $PATH
+echo "LD_LIBRARY_PATH = " $LD_LIBRARY_PATH
+
+

Index: myCERTI_env.sh.in
===================================================================
RCS file: myCERTI_env.sh.in
diff -N myCERTI_env.sh.in
--- myCERTI_env.sh.in   21 Sep 2008 10:48:29 -0000      1.6
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,86 +0,0 @@
-#!/bin/sh
-# @configure_input@
-
-export CERTI_VERSION="@PACKAGE_VERSION@"
-echo "CERTI version <$CERTI_VERSION>"
-
-# 1 : shell verification
-MYSHELL=`basename $SHELL`
-case $MYSHELL in
-    sh)   ;;
-       bash) ;;
-       zsh)  ;;
-       ksh)  ;;
-       *) 
-        echo "You may not be using a bourne shell, please use myCERTI.csh"
-        exit
-        ;;
-esac
-
-# 2 CERTI_HOST (i.e. where rtig runs)
-
-if [ $# -gt 0 ];
-then
-   export CERTI_HOST=$1
-else
-   export CERTI_HOST=localhost
-fi
-
-# 3 Architecture (i.e 32 or 64 bits)
-
-ARCH=`uname -m`
-#if [ "$ARCH" = "i686" ];
-#then
-#  NBITS="32bits"
-#else
-# NBITS="64bits"
-#fi
-echo "Current machine architecture is <$ARCH>".
-# assumed to be $NBITS"
-
-# 4 CERTI_HOME (i.e. where we find bin,lib,share,include about CERTI built)
-export address@hidden@
-alias go_certi_home='pushd $CERTI_HOME'
-
-# 5 CERTI_FED (i.e. where we find (default) FED files
-export CERTI_FED=$CERTI_HOME/share/federations
-alias go_certi_fed='pushd $CERTI_FED'
-
-# 6 PATH (i.e. to run easily rtig and s.o.)
-# Not PATH is not modified
-# if to be added PATH is already there
-MOREPATHBIN=$CERTI_HOME/bin
-MODIFPATH=`echo $PATH | grep $MOREPATHBIN`
-if [ -z "$MODIFPATH" ];
-then
-       export PATH=$MOREPATHBIN:$PATH
-       echo "Your PATH variable has been modified for bin"
-fi
-MOREPATHSCRIPTS=$CERTI_HOME/share/scripts
-MODIFPATH=`echo $PATH | grep $MOREPATHSCRIPTS`
-if [ -z "$MODIFPATH" ];
-then
-       export PATH=$MOREPATHSCRIPTS:$PATH
-       echo "Your PATH variable has been modified for scripts"
-fi
-
-# 7 LD_LIBRARY_PATH ( applications needs...)
-# Note LD_LIBRARY_PATH has to be extended sometimes
-MOREPATHLIB=$CERTI_HOME/lib
-MODIFPATH=`echo $LD_LIBRARY_PATH | grep $MOREPATHLIB`
-if [ -z "$MODIFPATH" ];
-then
-    export LD_LIBRARY_PATH=$MOREPATHLIB:$LD_LIBRARY_PATH
-fi
-
-echo "=========================================================="
-echo "** WARNING ** We hope you have made source myCERTI.sh **"
-echo "                                    ------"
-echo "If yes your variables for CERTI are now :"
-echo "CERTI_HOST      = " $CERTI_HOST
-echo "CERTI_HOME      = " $CERTI_HOME
-echo "CERTI_FED       = " $CERTI_FED
-echo "PATH            = " $PATH
-echo "LD_LIBRARY_PATH = " $LD_LIBRARY_PATH
-
-

Index: myCERTI_env.csh.in
===================================================================
RCS file: myCERTI_env.csh.in
diff -N myCERTI_env.csh.in
--- myCERTI_env.csh.in  21 Sep 2008 10:48:29 -0000      3.4
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,80 +0,0 @@
-#!/bin/csh
-# @configure_input@
-
-setenv CERTI_VERSION "@PACKAGE_VERSION@"
-echo "CERTI version <$CERTI_VERSION>"
-
-# 1 : shell verification
-
-setenv MONSHELL `echo $SHELL | cut -d '/' -f3`
-if ( $MONSHELL != "csh" && $MONSHELL != "tcsh" ) then
-  echo "You are not in CShell ($SHELL), please use myCERTI.sh."
-  exit
-endif
-
-# 2 CERTI_HOST (i.e. where rtig runs)
-
-if ( $# == "1") then
-   setenv CERTI_HOST $1
-else
-   setenv CERTI_HOST localhost
-endif
-
-# 3 Architecture (i.e 32 or 64 bits)
-
-setenv ARCH `uname -m`
-#if ( $ARCH == "x86_64" ) then
-#    setenv NBITS 64
-#else
-#    setenv NBITS 32
-#endif
-echo "Current machine architecture is <$ARCH>."
-# assumed to be $NBITS bits."
-
-# 4 CERTI_HOME (i.e. where we find bin,lib,share,include about CERTI built)
-setenv CERTI_HOME @prefix@
-alias go_certi_home='pushd $CERTI_HOME'
-
-# 5 CERTI_FED (i.e. where we find (default) FED files
-setenv CERTI_FED $CERTI_HOME/share/federations
-alias go_certi_fed='pushd $CERTI_FED'
-
-# 6 PATH (i.e. to run easily rtig and s.o.)
-# Note sometimes PATH is not modified
-setenv MOREPATHBIN "$CERTI_HOME/bin"
-setenv MODIFPATH `echo $PATH | grep $MOREPATHBIN`
-if ( $MODIFPATH == "" ) then    
-    setenv PATH $MOREPATHBIN":"$PATH
-    echo "Your PATH variable has been modified for bin"
-endif
-setenv MOREPATHSCRIPTS "$CERTI_HOME/share/scripts"
-setenv MODIFPATH `echo $PATH | grep $MOREPATHSCRIPTS`
-if ( $MODIFPATH == "" ) then    
-    setenv PATH $MOREPATHSCRIPTS":"$PATH
-    echo "Your PATH variable has been modified for scripts"
-endif
-
-# 7 LD_LIBRARY_PATH ( applications needs...)
-# Note LD_LIBRARY_PATH has to be extended sometimes
-if ( $?LD_LIBRARY_PATH ) then
-    setenv MOREPATHLIB "$CERTI_HOME/lib"
-    setenv MODIFPATH `echo $LD_LIBRARY_PATH | grep $MOREPATHLIB`
-    if ( $MODIFPATH == "" ) then
-        setenv LD_LIBRARY_PATH $MOREPATHLIB":"$LD_LIBRARY_PATH
-        echo "Your LD_LIBRARY_PATH variable has been extended."
-    endif
-else
-    setenv LD_LIBRARY_PATH $CERTI_HOME/lib
-endif
-
-echo "=========================================================="
-echo "** WARNING ** We hope you have made source myCERTI.tcsh **"
-echo "                                    ------"
-echo "If yes your variables for CERTI are now :"
-echo "CERTI_HOST      = " $CERTI_HOST
-echo "CERTI_HOME      = " $CERTI_HOME
-echo "CERTI_FED       = " $CERTI_FED
-echo "PATH            = " $PATH
-echo "LD_LIBRARY_PATH = " $LD_LIBRARY_PATH
-
-



reply via email to

[Prev in Thread] Current Thread [Next in Thread]