[Pkg-owncloud-commits] [owncloud-client] 12/219: OS X: Fix installer creation

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 5490063b7e618a589ea8e9fdfb5378aa31a1c901
Author: Markus Goetz <markus at woboq.com>
Date:   Wed Aug 27 11:40:10 2014 +0200

    OS X: Fix installer creation
    
    The script should know independently of the machine
---
 CMakeLists.txt                    |  5 +++++
 admin/osx/CMakeLists.txt          |  1 +
 admin/osx/create_mac_pkg.sh.cmake | 16 ++++++++--------
 admin/osx/macosx.pkgproj          | 12 ++++++------
 4 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6b2873a..f7be4fa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -128,6 +128,11 @@ configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 
 configure_file(test/test_journal.db "${CMAKE_BINARY_DIR}/test/test_journal.db" COPYONLY)
 
+# Copy that logo, the installer uses it later
+if(BUILD_OWNCLOUD_OSX_BUNDLE)
+    install(FILES resources/owncloud_logo_blue.png DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/)
+endif()
+
 include(OwnCloudCPack.cmake)
 
 add_definitions(-DUNICODE)
diff --git a/admin/osx/CMakeLists.txt b/admin/osx/CMakeLists.txt
index adf6ed4..4b339c5 100644
--- a/admin/osx/CMakeLists.txt
+++ b/admin/osx/CMakeLists.txt
@@ -1,2 +1,3 @@
 
 configure_file(create_mac_pkg.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/create_mac.sh)
+configure_file(macosx.pkgproj ${CMAKE_CURRENT_BINARY_DIR}/macosx.pkgproj)
\ No newline at end of file
diff --git a/admin/osx/create_mac_pkg.sh.cmake b/admin/osx/create_mac_pkg.sh.cmake
index 21c9e69..5ec0e81 100755
--- a/admin/osx/create_mac_pkg.sh.cmake
+++ b/admin/osx/create_mac_pkg.sh.cmake
@@ -6,20 +6,18 @@
 
 # the path of installation must be given as parameter
 if [ -z "$1" ]; then
-  echo "ERROR: Provide the CMAKE_INSTALL_DIR to this script."
+  echo "ERROR: Provide the path to CMAKE_INSTALL_DIR to this script as first parameter."
   exit 1
 fi
 
-prjfile=macosx.pkgproj
-vanilla_prjfile="@CMAKE_SOURCE_DIR@/admin/osx/macosx.pkgproj"
-if [ ! -f $vanilla_prjfile ]; then
-  echo "ERROR: macosx.pkgproj not in admin dir, start from CMAKE_SOURCE_DIR!"
-  exit 2
+if [ -z "$2" ]; then
+  echo "ERROR: Provide the path to build directory as second parameter."
+  exit 1
 fi
 
-cp $vanilla_prjfile $prjfile
-
 install_path=$1
+build_path=$2
+prjfile=$build_path/admin/osx/macosx.pkgproj
 
 # The name of the installer package
 installer=ownCloud- at MIRALL_VERSION_STRING@
@@ -45,3 +43,5 @@ fi
 # See http://s.sudre.free.fr/Software/documentation/Packages/en/Project_Configuration.html#5
 # certname=gdbsign
 # productsign --cert $certname admin/$installer ./$installer
+
+# FIXME: OEMs?
diff --git a/admin/osx/macosx.pkgproj b/admin/osx/macosx.pkgproj
index 2060f97..4863abc 100644
--- a/admin/osx/macosx.pkgproj
+++ b/admin/osx/macosx.pkgproj
@@ -1054,10 +1054,10 @@
 				<integer>6</integer>
 				<key>BACKGROUND_PATH</key>
 				<dict>
-					<key>PATH</key>
-					<string>/Users/mackie/owncloud.com/mirall/resources/owncloud_logo_blue.png</string>
-					<key>PATH_TYPE</key>
-					<integer>0</integer>
+				<key>PATH</key>
+				<string>./owncloud.app/Contents/Resources/owncloud_logo_blue.png</string>
+				<key>PATH_TYPE</key>
+				<integer>3</integer>
 				</dict>
 				<key>CUSTOM</key>
 				<integer>1</integer>
@@ -1240,9 +1240,9 @@
 			<key>BUILD_PATH</key>
 			<dict>
 				<key>PATH</key>
-				<string>/Users/mackie/owncloud.com/mirall/admin</string>
+				<string>../install/.</string>
 				<key>PATH_TYPE</key>
-				<integer>0</integer>
+				<integer>3</integer>
 			</dict>
 			<key>EXCLUDED_FILES</key>
 			<array>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git