Remove gras_stub_generator from windows installer. Add the java binding to it.

Must set SIMGRID_JAVA_SRC to find where is libSG_java.dll and examples.

diff --git a/buildtools/Cmake/GenerateDocWin.cmake b/buildtools/Cmake/GenerateDocWin.cmake
index 786cb66..c605e93 100644 (file)
--- a/buildtools/Cmake/GenerateDocWin.cmake
+++ b/buildtools/Cmake/GenerateDocWin.cmake
@@ -16,7 +16,7 @@ endif(WGET_PATH)
 if(NSIS_PATH)
 ADD_CUSTOM_TARGET(nsis
        COMMENT "Generating the SimGrid installor for Windows..."
-       DEPENDS simgrid simgrid_shared gras graphicator gras_stub_generator tesh simgrid-colorizer simgrid_update_xml
+       DEPENDS simgrid simgrid gras graphicator tesh simgrid-colorizer simgrid_update_xml
        COMMAND ${NSIS_PATH}/makensis.exe simgrid.nsi
        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/
 )

diff --git a/buildtools/Cmake/simgrid.nsi.in b/buildtools/Cmake/simgrid.nsi.in
index 57a99e6..2c9bba6 100644 (file)
--- a/buildtools/Cmake/simgrid.nsi.in
+++ b/buildtools/Cmake/simgrid.nsi.in
@@ -47,11 +47,9 @@ Section "Libraries and Headers" LibSection
        # install lib\r
        CreateDirectory $INSTDIR\lib\r
        setOutPath $INSTDIR\lib\r
-       file lib\libgras.@LIB_EXE@\r
-       file lib\libsimgrid.@LIB_EXE@\r
-       file /nonfatal lib\libsimgrid_shared.dll\r
-       file /nonfatal lib\libsimgrid_shared.dll.a\r
-       file /nonfatal lib\libsimgrid_shared.ref\r
+       file lib\libgras.dll\r
+       file lib\libsimgrid.dll\r
+       file lib\libsimgrid.def\r
        \r
        #install headers\r
        CreateDirectory  $INSTDIR\include\r
@@ -162,7 +160,6 @@ Section "Binaries" BinSection
        setOutPath $INSTDIR\bin\r
        file bin\colorize\r
        file bin\graphicator@BIN_EXE@\r
-       file bin\gras_stub_generator@BIN_EXE@\r
        file bin\simgrid_update_xml\r
        \r
 SectionEnd\r
@@ -215,6 +212,19 @@ Section "Pcre library" PCRESection
        file /nonfatal /r "@PCRE_LIBRARY_PATH@\share"\r
 SectionEnd\r
 \r
+Section "Java Bindings" JavaSection    \r
+       # install java library and examples\r
+       CreateDirectory $INSTDIR\examples\simgrid-java\r
+       setOutPath $INSTDIR\lib\r
+       file "$%SIMGRID_JAVA_SRC%\build\SG_java.dll"\r
+       file "$%SIMGRID_JAVA_SRC%\build\SG_java.def"\r
+       file "$%SIMGRID_JAVA_SRC%\simgrid.jar"\r
+       setOutPath $INSTDIR\examples\simgrid-java\r
+       file /r "$%SIMGRID_JAVA_SRC%\examples\"\r
+       # create shortcuts in the start menu programs directory\r
+       createShortCut  "$SMPROGRAMS\SimGrid @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@\Examples\Java project.lnk" "$INSTDIR\examples\simgrid-java"\r
+SectionEnd\r
+\r
 # default section start\r
 section        \r
        # define uninstaller name\r
@@ -232,10 +242,9 @@ section
        # Set Variables\r
        WriteRegExpandStr ${env_hkcu} SIMGRID_ROOT $INSTDIR\r
        WriteRegExpandStr ${env_hkcu} SIMGRID_VERSION @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@\r
-\r
        WriteRegExpandStr ${env_hkcu} SIMGRID_PCRE_LIBRARY_PATH $INSTDIR\GnuWin32\r
        WriteRegExpandStr ${env_hkcu} SIMGRID_PCRE_LIBRARY_VERSION "8.21"\r
-\r
+       \r
        WriteRegStr HKCU "SOFTWARE\SimGrid" "Version" "@SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@"\r
        WriteRegStr HKCU "SOFTWARE\SimGrid" "InstallPath" "$INSTDIR"\r
        \r
@@ -249,12 +258,14 @@ LangString DESC_BinSection                ${LANG_ENGLISH} "Install some useful tools for Simg
 LangString DESC_DocSection             ${LANG_ENGLISH} "Generated (doxygen) documentation."\r
 LangString DESC_ExamplesSection ${LANG_ENGLISH} "Simgrid's HelloWorld example and some classical platforms."\r
 LangString DESC_PCRESection    ${LANG_ENGLISH} "Install the PCRE and PCREPOSIX libraries for SimGrid."\r
+LangString DESC_JAVASection    ${LANG_ENGLISH} "Install the Java binding and examples."\r
 \r
 LangString DESC_LibSection             ${LANG_FRENCH}  "Installer les librairies Simgrid et Gras et leurs Entêtes."\r
 LangString DESC_BinSection             ${LANG_FRENCH}  "Installer les outils optionnels."\r
 LangString DESC_DocSection             ${LANG_FRENCH}  "Installer la documentation."\r
 LangString DESC_ExamplesSection ${LANG_FRENCH}         "Installer un exemple 'HelloWorld' et des fichiers de plate-formes types."\r
 LangString DESC_PCRESection    ${LANG_FRENCH}  "Installer les librairies PCRE et PCREPOSIX for SimGrid."\r
+LangString DESC_JAVASection    ${LANG_FRENCH}  "Installer la librairie Simgrid-java and les examples."\r
 \r
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN\r
   !insertmacro MUI_DESCRIPTION_TEXT ${LibSection}              $(DESC_LibSection)\r
@@ -262,6 +273,7 @@ LangString DESC_PCRESection         ${LANG_FRENCH}  "Installer les librairies PCRE et P
   !insertmacro MUI_DESCRIPTION_TEXT ${DocSection}              $(DESC_DocSection)\r
   !insertmacro MUI_DESCRIPTION_TEXT ${ExamplesSection}         $(DESC_ExamplesSection)\r
   !insertmacro MUI_DESCRIPTION_TEXT ${PCRESection}             $(DESC_PCRESection)\r
+  !insertmacro MUI_DESCRIPTION_TEXT ${JAVASection}             $(DESC_JAVASection)\r
 !insertmacro MUI_FUNCTION_DESCRIPTION_END\r
 \r
 # create a section to define what the uninstaller does.\r
@@ -272,16 +284,13 @@ section "Uninstall"
        delete $INSTDIR\uninstaller@BIN_EXE@\r
 \r
        # delete installed libs\r
-       delete $INSTDIR\lib\libgras.@LIB_EXE@\r
-       delete $INSTDIR\lib\libsimgrid.@LIB_EXE@\r
-       delete $INSTDIR\lib\libsimgrid_shared.dll\r
-       delete $INSTDIR\lib\libsimgrid_shared.dll.a\r
-       delete $INSTDIR\lib\libsimgrid_shared.ref\r
+       delete $INSTDIR\lib\libgras.dll\r
+       delete $INSTDIR\lib\libsimgrid.dll\r
+       delete $INSTDIR\lib\libsimgrid.def\r
 \r
        # delete installed bin\r
        delete $INSTDIR\bin\colorize\r
        delete $INSTDIR\bin\graphicator@BIN_EXE@\r
-       delete $INSTDIR\bin\gras_stub_generator@BIN_EXE@\r
        delete $INSTDIR\bin\simgrid_update_xml\r
        delete $INSTDIR\bin\smpicc\r
        delete $INSTDIR\bin\smpif2c\r
@@ -390,6 +399,9 @@ section "Uninstall"
        DeleteRegValue ${env_hkcu} SIMGRID_PCRE_LIBRARY_VERSION\r
     DeleteRegKey HKCU "SOFTWARE\SimGrid"\r
     \r
+    # delete JAVA-bindings\r
+    RMDir /r "$INSTDIR\simgrid-java"\r
+    \r
     # delete INSTDIR\r
     RMDir  /r "$INSTDIR"\r
     \r