From 5375029126e512634544262734b05a3f9aa04826 Mon Sep 17 00:00:00 2001
From: "Michael J. Rubinsky" <mrubinsk@horde.org>
Date: Fri, 25 Sep 2009 15:02:32 -0400
Subject: [PATCH] Clean up build options, standardize plist entries, add
 initial try at a PackageMaker installer script for iPhoto plugin.

---
 .../project.pbxproj                                     | 17 ++++++++---------
 ApertureToAnselExportPlugin/Info.plist                  |  4 +++-
 iPhoto2Ansel/Info.plist                                 |  2 +-
 .../Installer/iPhoto2Ansel.pmdoc/01iphoto-contents.xml  |  1 +
 iPhoto2Ansel/Installer/iPhoto2Ansel.pmdoc/01iphoto.xml  |  1 +
 iPhoto2Ansel/Installer/iPhoto2Ansel.pmdoc/index.xml     |  1 +
 6 files changed, 15 insertions(+), 11 deletions(-)
 create mode 100644 iPhoto2Ansel/Installer/iPhoto2Ansel.pmdoc/01iphoto-contents.xml
 create mode 100644 iPhoto2Ansel/Installer/iPhoto2Ansel.pmdoc/01iphoto.xml
 create mode 100644 iPhoto2Ansel/Installer/iPhoto2Ansel.pmdoc/index.xml

diff --git a/ApertureToAnselExportPlugin/ApertureToAnselExportPlugin.xcodeproj/project.pbxproj b/ApertureToAnselExportPlugin/ApertureToAnselExportPlugin.xcodeproj/project.pbxproj
index 394ac7d40..61ced225c 100644
--- a/ApertureToAnselExportPlugin/ApertureToAnselExportPlugin.xcodeproj/project.pbxproj
+++ b/ApertureToAnselExportPlugin/ApertureToAnselExportPlugin.xcodeproj/project.pbxproj
@@ -338,10 +338,7 @@
 		1DEB913C08733D840010E9CD /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = (
-					ppc,
-					i386,
-				);
+				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
 				DSTROOT = /;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_MODEL_TUNING = G5;
@@ -350,6 +347,8 @@
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Library/Application Support/Aperture/Plug-Ins/Export/";
 				PRODUCT_NAME = ApertureToAnselExportPlugin;
+				SDKROOT = macosx10.5;
+				VALID_ARCHS = "ppc64 i386_64 i386 ppc";
 				WRAPPER_EXTENSION = ApertureExport;
 			};
 			name = Release;
@@ -357,28 +356,28 @@
 		1DEB913F08733D840010E9CD /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
 				FRAMEWORK_SEARCH_PATHS = "/Library/Frameworks//**";
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				PREBINDING = NO;
 				SDKROOT = macosx10.5;
+				VALID_ARCHS = i386;
 			};
 			name = Debug;
 		};
 		1DEB914008733D840010E9CD /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = (
-					ppc,
-					i386,
-				);
+				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
 				FRAMEWORK_SEARCH_PATHS = "/Library/Frameworks//**";
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				PREBINDING = NO;
-				SDKROOT = macosx10.4;
+				SDKROOT = macosx10.5;
+				VALID_ARCHS = "i386_64 ppc64 i386 ppc";
 			};
 			name = Release;
 		};
diff --git a/ApertureToAnselExportPlugin/Info.plist b/ApertureToAnselExportPlugin/Info.plist
index 420401558..931ef3899 100644
--- a/ApertureToAnselExportPlugin/Info.plist
+++ b/ApertureToAnselExportPlugin/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>ApertureToAnselExportPlugin</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.yourcompany.export.ApertureToAnselExportPlugin</string>
+	<string>org.horde.export.ApertureToAnselExportPlugin</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -69,5 +69,7 @@
 			</array>
 		</dict>
 	</array>
+	<key>NSHumanReadableCopyright</key>
+	<string>2008-2009 The Horde Project (http://www.horde.org)</string>
 </dict>
 </plist>
diff --git a/iPhoto2Ansel/Info.plist b/iPhoto2Ansel/Info.plist
index 113f68d6c..baf5afd7f 100644
--- a/iPhoto2Ansel/Info.plist
+++ b/iPhoto2Ansel/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.horde.export.iphoto2ansel</string>
+	<string>org.horde.export.iPhoto2Ansel</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
diff --git a/iPhoto2Ansel/Installer/iPhoto2Ansel.pmdoc/01iphoto-contents.xml b/iPhoto2Ansel/Installer/iPhoto2Ansel.pmdoc/01iphoto-contents.xml
new file mode 100644
index 000000000..f917e9a9a
--- /dev/null
+++ b/iPhoto2Ansel/Installer/iPhoto2Ansel.pmdoc/01iphoto-contents.xml
@@ -0,0 +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
diff --git a/iPhoto2Ansel/Installer/iPhoto2Ansel.pmdoc/01iphoto.xml b/iPhoto2Ansel/Installer/iPhoto2Ansel.pmdoc/01iphoto.xml
new file mode 100644
index 000000000..a2d86e57d
--- /dev/null
+++ b/iPhoto2Ansel/Installer/iPhoto2Ansel.pmdoc/01iphoto.xml
@@ -0,0 +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
diff --git a/iPhoto2Ansel/Installer/iPhoto2Ansel.pmdoc/index.xml b/iPhoto2Ansel/Installer/iPhoto2Ansel.pmdoc/index.xml
new file mode 100644
index 000000000..54ccc63a1
--- /dev/null
+++ b/iPhoto2Ansel/Installer/iPhoto2Ansel.pmdoc/index.xml
@@ -0,0 +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
-- 
2.11.0