[GNUnet-SVN] r8407 - in gnunet-cocoa/GNUnet Setup: . GNUnet Setup.xcodeproj

[gnunet]

Author: holindho
Date: 2009-04-09 00:41:06 -0600 (Thu, 09 Apr 2009)
New Revision: 8407

Modified:
   gnunet-cocoa/GNUnet Setup/GNUnet Setup.xcodeproj/project.pbxproj
   gnunet-cocoa/GNUnet Setup/build-package.sh
Log:
better packaging


Modified: gnunet-cocoa/GNUnet Setup/GNUnet Setup.xcodeproj/project.pbxproj
===================================================================
--- gnunet-cocoa/GNUnet Setup/GNUnet Setup.xcodeproj/project.pbxproj    
2009-04-09 06:37:44 UTC (rev 8406)
+++ gnunet-cocoa/GNUnet Setup/GNUnet Setup.xcodeproj/project.pbxproj    
2009-04-09 06:41:06 UTC (rev 8407)
@@ -215,7 +215,7 @@
                                GCC_MODEL_TUNING = G5;
                                GCC_OPTIMIZATION_LEVEL = 0;
                                INFOPLIST_FILE = Info.plist;
-                               INSTALL_PATH = "$(HOME)/Applications";
+                               INSTALL_PATH = /Applications/GNUnet;
                                PRODUCT_NAME = "GNUnet Setup";
                                WRAPPER_EXTENSION = app;
                                ZERO_LINK = YES;
@@ -232,7 +232,7 @@
                                GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
                                GCC_MODEL_TUNING = G5;
                                INFOPLIST_FILE = Info.plist;
-                               INSTALL_PATH = "$(HOME)/Applications";
+                               INSTALL_PATH = /Applications/GNUnet;
                                PRODUCT_NAME = "GNUnet Setup";
                                WRAPPER_EXTENSION = app;
                        };
@@ -243,6 +243,7 @@
                        buildSettings = {
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
+                               INSTALL_MODE_FLAG = "ug+w,o-w,a+rX";
                                PREBINDING = NO;
                                SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
                        };
@@ -253,6 +254,7 @@
                        buildSettings = {
                                GCC_WARN_ABOUT_RETURN_TYPE = YES;
                                GCC_WARN_UNUSED_VARIABLE = YES;
+                               INSTALL_MODE_FLAG = "ug+w,o-w,a+rX";
                                PREBINDING = NO;
                                SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
                        };

Modified: gnunet-cocoa/GNUnet Setup/build-package.sh
===================================================================
--- gnunet-cocoa/GNUnet Setup/build-package.sh  2009-04-09 06:37:44 UTC (rev 
8406)
+++ gnunet-cocoa/GNUnet Setup/build-package.sh  2009-04-09 06:41:06 UTC (rev 
8407)
@@ -1,18 +1,14 @@
-SRC_BUILD_DIR="./build/Release"
 BUILD_DIR="/tmp/GNUnetSetup-build"
 RESOURCE_DIR="${BUILD_DIR}/Resources"
-COMPONENT_DIR="${BUILD_DIR}/Release"
+COMPONENT_DIR="${BUILD_DIR}/Applications"
 PACKAGE_DIR="${BUILD_DIR}/Package"
 PACKAGE_NAME="${PACKAGE_DIR}/GNUnetSetup.pkg"
 
 
PACKAGEMAKER="/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker"
 
-# copy orig build to temporary build dir, so that we can chown/chgrp
-if [ -e "${COMPONENT_DIR}" ] ; then
-       rm -rf "${COMPONENT_DIR}" 
-fi     
-mkdir -p "${COMPONENT_DIR}"/GNUnet
-cp -pPR "${SRC_BUILD_DIR}"/*.app "${COMPONENT_DIR}"/GNUnet
+# destroot to package build dir
+sudo rm -rf "${BUILD_DIR}"
+xcodebuild -configuration "Release"  DSTROOT="${BUILD_DIR}" install
 
 # copy package/installer resources
 if [ -e "${RESOURCE_DIR}" ] ; then
@@ -23,8 +19,9 @@
 cp Package/IFRequirement.strings "${RESOURCE_DIR}/IFRequirement.strings"
 
 # final permissions
-chown -R root "${COMPONENT_DIR}"/*
-chgrp -R admin "${COMPONENT_DIR}"/*
+sudo chmod 775 "${COMPONENT_DIR}"/*
+sudo chown -R root "${COMPONENT_DIR}"/*
+sudo chgrp -R admin "${COMPONENT_DIR}"/*
 
 # create package
 if [ -e "${PACKAGE_DIR}" ] ; then
@@ -32,5 +29,5 @@
 fi
 mkdir -p "${PACKAGE_DIR}"
 
-$PACKAGEMAKER -build -v -p "${PACKAGE_NAME}" -f "${COMPONENT_DIR}" -r 
"${RESOURCE_DIR}" -i Package/Info.plist -d Package/Description.plist
+sudo $PACKAGEMAKER -build -v -p "${PACKAGE_NAME}" -f "${COMPONENT_DIR}" -r 
"${RESOURCE_DIR}" -i Package/Info.plist -d Package/Description.plist