tweak the build path to work along with the packaging script

diff --git a/iPhoto2Ansel/Installer/iPhoto2Ansel.pmdoc/01iphoto-contents.xml b/iPhoto2Ansel/Installer/iPhoto2Ansel.pmdoc/01iphoto-contents.xml
index f917e9a..dfec9a6 100644 (file)
--- a/iPhoto2Ansel/Installer/iPhoto2Ansel.pmdoc/01iphoto-contents.xml
+++ b/iPhoto2Ansel/Installer/iPhoto2Ansel.pmdoc/01iphoto-contents.xml
@@ -1 +1 @@
-<pkg-contents spec="1.12"><f n="iPhoto2Ansel-1.0" o="mrubinsk" g="_www" p="16877" pt="/Users/mrubinsk/horde-dev/horde-hatchery/iPhoto2Ansel/iPhoto2Ansel-1.0" m="true" t="file"><f n="Library" o="root" g="admin" p="17405"><f n="Application Support" o="root" g="admin" p="16893"><f n="iPhoto" o="root" g="admin" p="16893"><f n="plugins" o="mrubinsk" g="staff" p="16877"><f n="iPhoto2Ansel.iPhotoExporter" o="mrubinsk" g="staff" p="16877"><f n=".DS_Store" o="mrubinsk" g="staff" p="33204" x="true"><mod>mode</mod></f><f n="Contents" o="mrubinsk" g="staff" p="16877"><f n="Info.plist" o="mrubinsk" g="staff" p="33188"/><f n="MacOS" o="mrubinsk" g="staff" p="16877"><f n="iPhoto2Ansel" o="mrubinsk" g="staff" p="33261"/></f><f n="Resources" o="mrubinsk" g="staff" p="16877"><f n="AnselGalleryPanel.nib" o="mrubinsk" g="staff" p="33188"/><f n="English.lproj" o="mrubinsk" g="staff" p="16877"><f n="AnselGalleryPanel.nib" o="mrubinsk" g="staff" p="33188"/><f n="AnselServers.nib" o="mrubinsk" g="staff" p="33188"/><f n="InfoPlist.strings" o="mrubinsk" g="staff" p="33188"/><f n="Panel.nib" o="mrubinsk" g="staff" p="33204"><mod>mode</mod></f><f n="ProgressSheet.nib" o="mrubinsk" g="staff" p="33188"/></f><f n="iPhoto2Ansel.icns" o="mrubinsk" g="staff" p="33204"><mod>mode</mod></f></f></f></f><mod>owner</mod></f></f></f></f></f></pkg-contents>
\ No newline at end of file
+<pkg-contents spec="1.12"><f n="iPhoto2Ansel-1.0" o="mrubinsk" g="_www" p="16877" pt="/Users/mrubinsk/horde-dev/horde-hatchery/iPhoto2Ansel/build/Release/iPhoto2Ansel-1.0" m="false" t="file"><f n="Library" o="root" g="admin" p="17405"><f n="Application Support" o="root" g="admin" p="16893"><f n="iPhoto" o="root" g="admin" p="16893"><f n="Plugins" o="mrubinsk" g="staff" p="16877"><f n="iPhoto2Ansel.iPhotoExporter" o="mrubinsk" g="staff" p="16877"><f n="Contents" o="mrubinsk" g="staff" p="16877"><f n="Info.plist" o="mrubinsk" g="staff" p="33188"/><f n="MacOS" o="mrubinsk" g="staff" p="16877"><f n="iPhoto2Ansel" o="mrubinsk" g="staff" p="33261"/></f><f n="Resources" o="mrubinsk" g="staff" p="16877"><f n="AnselGalleryPanel.nib" o="mrubinsk" g="staff" p="33188"/><f n="English.lproj" o="mrubinsk" g="staff" p="16877"><f n="AnselGalleryPanel.nib" o="mrubinsk" g="staff" p="33188"/><f n="AnselServers.nib" o="mrubinsk" g="staff" p="33188"/><f n="InfoPlist.strings" o="mrubinsk" g="staff" p="33188"/><f n="Panel.nib" o="mrubinsk" g="staff" p="33204"/><f n="ProgressSheet.nib" o="mrubinsk" g="staff" p="33188"/></f><f n="iPhoto2Ansel.icns" o="mrubinsk" g="staff" p="33204"/></f></f></f></f></f></f></f></f></pkg-contents>
\ No newline at end of file

diff --git a/iPhoto2Ansel/Installer/iPhoto2Ansel.pmdoc/01iphoto.xml b/iPhoto2Ansel/Installer/iPhoto2Ansel.pmdoc/01iphoto.xml
index a2d86e5..100fbc8 100644 (file)
--- a/iPhoto2Ansel/Installer/iPhoto2Ansel.pmdoc/01iphoto.xml
+++ b/iPhoto2Ansel/Installer/iPhoto2Ansel.pmdoc/01iphoto.xml
@@ -1 +1 @@
-<pkgref spec="1.12" uuid="02A94BFF-3365-4797-B49D-864805F8D4A4"><config><identifier>org.horde.iphoto2ansel.iPhoto2Ansel-1.pkg</identifier><version>1.0</version><description/><post-install type="none"/><requireAuthorization/><installFrom>/Users/mrubinsk/horde-dev/horde-hatchery/iPhoto2Ansel/iPhoto2Ansel-1.0</installFrom><installTo>/</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"/><mod>parent</mod></config><contents><file-list>01iphoto-contents.xml</file-list><component id="org.horde.export.iPhoto2Ansel" path="/Users/mrubinsk/horde-dev/horde-hatchery/iPhoto2Ansel/iPhoto2Ansel-1.0/Library/Application Support/iPhoto/plugins/iPhoto2Ansel.iPhotoExporter" version="1.0"/><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref>
\ No newline at end of file
+<pkgref spec="1.12" uuid="2D9F33E5-5B6F-4169-8EAB-B31C3EAAA78B"><config><identifier>org.horde.export.iPhoto2Ansel.iPhoto2Ansel-1.pkg</identifier><version>1.0</version><description/><post-install type="none"/><requireAuthorization/><installFrom relative="true">../build/Release/iPhoto2Ansel-1.0</installFrom><installTo>/</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"/><mod>installFrom.isRelativeType</mod><mod>identifier</mod><mod>parent</mod><mod>installTo</mod></config><contents><file-list>01iphoto-contents.xml</file-list><component id="org.horde.export.iPhoto2Ansel" path="/Users/mrubinsk/horde-dev/horde-hatchery/iPhoto2Ansel/build/Release/iPhoto2Ansel-1.0/Library/Application Support/iPhoto/Plugins/iPhoto2Ansel.iPhotoExporter" version="1.0"/><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref>
\ No newline at end of file

diff --git a/iPhoto2Ansel/Installer/iPhoto2Ansel.pmdoc/index.xml b/iPhoto2Ansel/Installer/iPhoto2Ansel.pmdoc/index.xml
index 54ccc63..8e23c59 100644 (file)
--- a/iPhoto2Ansel/Installer/iPhoto2Ansel.pmdoc/index.xml
+++ b/iPhoto2Ansel/Installer/iPhoto2Ansel.pmdoc/index.xml
@@ -1 +1 @@
-<pkmkdoc spec="1.12"><properties><title>iPhoto2Ansel</title><build>/Users/mrubinsk/horde-dev/horde-hatchery/iPhoto2Ansel/Info.pkg</build><organization>org.horde</organization><userSees ui="easy"/><min-target os="3"/><domain anywhere="true" system="true" user="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><contents><choice title="iPhoto2Ansel-1" id="choice1" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="org.horde.iphoto2ansel.iPhoto2Ansel-1.pkg"/></choice></contents><resources bg-scale="none" bg-align="topleft"><locale lang="en"/></resources><flags/><item type="file">01iphoto.xml</item><mod>properties.title</mod><mod>properties.userDomain</mod><mod>properties.systemDomain</mod></pkmkdoc>
\ No newline at end of file
+<pkmkdoc spec="1.12"><properties><title>iPhoto2Ansel</title><build>/Users/mrubinsk/horde-dev/horde-hatchery/iPhoto2Ansel/build/Package/iPhoto2Ansel.pkg</build><organization>org.horde</organization><userSees ui="easy"/><min-target os="3"/><domain anywhere="true" system="true" user="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><contents><choice title="iPhoto2Ansel-1" id="choice2" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="org.horde.export.iPhoto2Ansel.iPhoto2Ansel-1.pkg"/></choice></contents><resources bg-scale="none" bg-align="topleft"><locale lang="en"/></resources><flags/><item type="file">01iphoto.xml</item><mod>properties.title</mod><mod>properties.userDomain</mod><mod>properties.systemDomain</mod></pkmkdoc>
\ No newline at end of file

diff --git a/iPhoto2Ansel/iPhoto2Ansel.xcodeproj/project.pbxproj b/iPhoto2Ansel/iPhoto2Ansel.xcodeproj/project.pbxproj
index c93cd3d..9350623 100644 (file)
--- a/iPhoto2Ansel/iPhoto2Ansel.xcodeproj/project.pbxproj
+++ b/iPhoto2Ansel/iPhoto2Ansel.xcodeproj/project.pbxproj
@@ -381,8 +381,10 @@
                1DEB913C08733D840010E9CD /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
+                               CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/iPhoto2Ansel-1.0/Library/Application Support/iPhoto/Plugins";
                                DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
                                DEPLOYMENT_LOCATION = NO;
+                               DSTROOT = /;
                                FRAMEWORK_SEARCH_PATHS = (
                                        "\"$(SRCROOT)/XMLRPC\"",
                                        "$(inherited)",
@@ -393,8 +395,9 @@
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
                                GCC_PREFIX_HEADER = iPhoto2Ansel_Prefix.pch;
                                INFOPLIST_FILE = Info.plist;
-                               INSTALL_PATH = "$(HOME)/Library/Application Support/iPhoto/Plugins";
+                               INSTALL_PATH = "Library/Application Support/iPhoto/Plugins";
                                PRODUCT_NAME = iPhoto2Ansel;
+                               SKIP_INSTALL = NO;
                                VALID_ARCHS = "i386 x86_64 ppc64 ppc";
                                WRAPPER_EXTENSION = iPhotoExporter;
                        };