From 3f0be630a2d007bf44d53b14dcd27603364d2dcf Mon Sep 17 00:00:00 2001
From: Rashad Kanavath <rashad.kanavath@c-s.fr>
Date: Mon, 18 May 2015 17:51:44 +0200
Subject: [PATCH] COMP: use spereate files in monteverdi2 and mapla bundle
---
Packaging/MacOS/BundleFixing.cmake.in | 8 ++--
Packaging/MacOS/CMakeLists.txt | 46 ++++++++++++++-----
Packaging/MacOS/Info.plist.in | 4 +-
.../{StartupCommand => StartupCommand.in} | 2 +-
4 files changed, 41 insertions(+), 19 deletions(-)
rename Packaging/MacOS/{StartupCommand => StartupCommand.in} (87%)
mode change 100644 => 100755
diff --git a/Packaging/MacOS/BundleFixing.cmake.in b/Packaging/MacOS/BundleFixing.cmake.in
index 6133bf0eb3..7c654626a3 100644
--- a/Packaging/MacOS/BundleFixing.cmake.in
+++ b/Packaging/MacOS/BundleFixing.cmake.in
@@ -1,13 +1,13 @@
set(APP_LIST @OTB_APPS_NAME_LIST@)
foreach(APP ${APP_LIST})
- list(APPEND OTB_APPS_LIST_INSTALL ${CMAKE_INSTALL_PREFIX}/lib/otb/applications/${APP})
+ list(APPEND OTB_APPS_LIST_INSTALL ${CMAKE_INSTALL_PREFIX}/../Runtime/lib/otb/applications/${APP})
endforeach(APP)
include(BundleUtilities)
set(BU_CHMOD_BUNDLE_ITEMS ON)
fixup_bundle(
- "${CMAKE_INSTALL_PREFIX}/bin/monteverdi2"
- "${OTB_APPS_LIST_INSTALL};${CMAKE_INSTALL_PREFIX}/lib/qt4/plugins/sqldrivers/libqsqlite.dylib"
- "${CMAKE_INSTALL_PREFIX}/lib/otb;${CMAKE_INSTALL_PREFIX}/lib/qt4/plugins/sqldrivers"
+ "${CMAKE_INSTALL_PREFIX}/bin/@EXE_FILENAME@"
+ "${OTB_APPS_LIST_INSTALL};${CMAKE_INSTALL_PREFIX}/../Runtime/lib/qt4/plugins/sqldrivers/libqsqlite.dylib"
+ "${CMAKE_INSTALL_PREFIX}/../Runtime/lib/otb;${CMAKE_INSTALL_PREFIX}/../Runtime/lib/qt4/plugins/sqldrivers"
)
diff --git a/Packaging/MacOS/CMakeLists.txt b/Packaging/MacOS/CMakeLists.txt
index 54d6b46a19..9af8afb20e 100644
--- a/Packaging/MacOS/CMakeLists.txt
+++ b/Packaging/MacOS/CMakeLists.txt
@@ -1,11 +1,32 @@
-set(CPACK_GENERATOR "Bundle" PARENT_SCOPE)
-set(CPACK_BUNDLE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/Monteverdi2.icns" PARENT_SCOPE)
-set(CPACK_BUNDLE_NAME "Monteverdi2-${Monteverdi2_VERSION_MAJOR}.${Monteverdi2_VERSION_MINOR}" PARENT_SCOPE)
-set(CPACK_BUNDLE_PLIST "${CMAKE_CURRENT_BINARY_DIR}/Info.plist" PARENT_SCOPE)
-set(CPACK_BUNDLE_STARTUP_COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/StartupCommand" PARENT_SCOPE)
+set(APPLICATION_NAME "Monteverdi2")
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in ${CMAKE_CURRENT_BINARY_DIR}/Info.plist)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in
+ ${CMAKE_BINARY_DIR}/Packaging/MacOS/Monteverdi2-Info.plist)
+set(EXE_FILENAME "monteverdi2")
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/StartupCommand.in
+ ${CMAKE_BINARY_DIR}/Packaging/MacOS/Monteverdi2-StartupCommand
+ @ONLY)
+
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/BundleFixing.cmake.in
+ ${CMAKE_CURRENT_BINARY_DIR}/BundleFixing.cmake
+ @ONLY)
+
+#mapla
+set(APPLICATION_NAME "Mapla")
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in
+ ${CMAKE_BINARY_DIR}/Packaging/MacOS/Mapla-Info.plist)
+
+set(EXE_FILENAME "mapla")
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/StartupCommand.in
+ ${CMAKE_BINARY_DIR}/Packaging/MacOS/Mapla-StartupCommand
+ @ONLY)
+
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/BundleFixing.cmake.in
+ ${CMAKE_CURRENT_BINARY_DIR}/BundleFixing2.cmake
+ @ONLY)
+
+
install(DIRECTORY $ENV{GDAL_DATA}
DESTINATION share
COMPONENT Resources)
@@ -35,11 +56,12 @@ foreach(APP ${OTB_APPS_LIST})
list(APPEND OTB_APPS_NAME_LIST ${APP_NAME})
endforeach(APP)
-# configure the file to pass the list of available applications
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/BundleFixing.cmake.in
- ${CMAKE_CURRENT_BINARY_DIR}/BundleFixing.cmake
- @ONLY)
-#Use the configured file with the list of apps
+#Use the configured file with the list of apps : monteverdi2
install(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/BundleFixing.cmake
- COMPONENT Runtime)
+ COMPONENT Monteverdi2)
+
+
+#Use the configured file with the list of apps : mapla
+install(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/BundleFixing2.cmake
+ COMPONENT Mapla)
diff --git a/Packaging/MacOS/Info.plist.in b/Packaging/MacOS/Info.plist.in
index afd401fea1..8c7d6cbf1a 100644
--- a/Packaging/MacOS/Info.plist.in
+++ b/Packaging/MacOS/Info.plist.in
@@ -3,9 +3,9 @@
<plist version="1.0">
<dict>
<key>CFBundleExecutable</key>
- <string>Monteverdi2-@Monteverdi2_VERSION_MAJOR@.@Monteverdi2_VERSION_MINOR@</string>
+ <string>@APPLICATION_NAME@-@Monteverdi2_VERSION_MAJOR@.@Monteverdi2_VERSION_MINOR@</string>
<key>CFBundleIconFile</key>
- <string>Monteverdi2-@Monteverdi2_VERSION_MAJOR@.@Monteverdi2_VERSION_MINOR@.icns</string>
+ <string>@APPLICATION_NAME@-@Monteverdi2_VERSION_MAJOR@.@Monteverdi2_VERSION_MINOR@.icns</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>
diff --git a/Packaging/MacOS/StartupCommand b/Packaging/MacOS/StartupCommand.in
old mode 100644
new mode 100755
similarity index 87%
rename from Packaging/MacOS/StartupCommand
rename to Packaging/MacOS/StartupCommand.in
index 8fe183f414..a4587e0eee
--- a/Packaging/MacOS/StartupCommand
+++ b/Packaging/MacOS/StartupCommand.in
@@ -11,4 +11,4 @@ export ITK_AUTOLOAD_PATH=$RESOURCES/lib/otb/applications
cd $HOME
-exec "$RESOURCES/bin/monteverdi2"
+exec "$RESOURCES/bin/@EXE_FILENAME@"
--
GitLab