@@ -1,3 +1,6 @@ +0.4.1a1 2009/09/20 +- First 64 Bit compilation, probably not working correctly. + 0.4.0 2009/01/15 - Added support for decrypting encrypted topics. As of now no visible feedback exists, though. - Added /encTopic command to set an encrypted topic. CHANGELOG.txt @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 42; + objectVersion = 44; objects = { /* Begin PBXBuildFile section */ @@ -82,7 +82,7 @@ 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; }; 32DBCF630370AF2F00C91783 /* FiSHy_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FiSHy_Prefix.pch; sourceTree = "<group>"; }; 8D5B49B6048680CD000E48DA /* FiSHy.plugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = FiSHy.plugin; sourceTree = BUILT_PRODUCTS_DIR; }; - 8D5B49B7048680CD000E48DA /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = Info.plist; sourceTree = "<group>"; }; + 8D5B49B7048680CD000E48DA /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; D2F7E65807B2D6F200F64583 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; }; D4391C3B0BAAD9A600C12ED9 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/AboutDialog.nib; sourceTree = "<group>"; }; D4423DD70B84AE2B0039DCB9 /* FiSHBlowfish.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FiSHBlowfish.h; sourceTree = "<group>"; }; @@ -444,7 +444,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = "/usr/bin/perl -w"; - shellScript = "# Xcode auto-versioning script for Subversion by Axel Andersson\n# Updated for git by Marcus S. Zarra and Matt Long\n \nuse strict;\n \nmy $REV = `$ENV{SUBVERSION_INSTALL_DIR}/git show --abbrev-commit | grep \"^commit\"`;\nmy $INFO = \"$ENV{BUILT_PRODUCTS_DIR}/$ENV{WRAPPER_NAME}/Contents/Info.plist\";\n \nmy $version = $REV;\nif( $version =~ /^commit\\s+([^.]+)\\.\\.\\.$/ )\n{ \n\t$version = $1;\n}\nelse\n{\n\t$version = undef;\n}\ndie \"$0: No Git revision found\" unless $version;\n \nopen(FH, \"$INFO\") or die \"$0: $INFO: $!\";\nmy $info = join(\"\", <FH>);\nclose(FH);\n \n$info =~ s/([\\t ]+<key>CFBundleShortVersionString<\\/key>\\n[\\t ]+<string>).*?(<\\/string>)/$1$ENV{\"APPLICATION_VERSION\"} ($version)$2/;\n \nopen(FH, \">$INFO\") or die \"$0: $INFO: $!\";\nprint FH $info;\nclose(FH);"; + shellScript = "# Xcode auto-versioning script for Subversion by Axel Andersson\n# Updated for git by Marcus S. Zarra and Matt Long\n \nuse strict;\n \nmy $REV = `cd $ENV{PROJECT_DIR}; $ENV{SUBVERSION_INSTALL_DIR}/git show --abbrev-commit | grep \"^commit\"`;\nprintf $REV;\nmy $INFO = \"$ENV{BUILT_PRODUCTS_DIR}/$ENV{WRAPPER_NAME}/Contents/Info.plist\";\n \nmy $version = $REV;\nif( $version =~ /^commit ([0-9a-f]{7}$)/ )\n{ \n\t$version = $1;\n}\nelse\n{\n\t$version = undef;\n}\ndie \"$0: No Git revision found\" unless $version;\n \nopen(FH, \"$INFO\") or die \"$0: $INFO: $!\";\nmy $info = join(\"\", <FH>);\nclose(FH);\n \n$info =~ s/([\\t ]+<key>CFBundleShortVersionString<\\/key>\\n[\\t ]+<string>).*?(<\\/string>)/$1$ENV{\"APPLICATION_VERSION\"} ($version)$2/;\n \nopen(FH, \">$INFO\") or die \"$0: $INFO: $!\";\nprint FH $info;\nclose(FH);"; }; D4E281530B8D06690095A792 /* Make Disk Image */ = { isa = PBXShellScriptBuildPhase; @@ -539,6 +539,7 @@ GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = FiSHy_Prefix.pch; + GCC_VERSION = 4.0; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Library/Application Support/Colloquy/PlugIns"; LIBRARY_SEARCH_PATHS = ( @@ -548,6 +549,9 @@ LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)\""; OTHER_LDFLAGS = ""; PRODUCT_NAME = FiSHy; + SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk"; + "SDKROOT[arch=ppc64]" = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk"; + "SDKROOT[arch=x86_64]" = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk"; WRAPPER_EXTENSION = plugin; ZERO_LINK = NO; }; @@ -556,10 +560,8 @@ 1DEB913C08733D840010E9CD /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - ppc, - i386, - ); + ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)"; + ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc"; BUNDLE_LOADER = "${CONFIGURATION_BUILD_DIR}/Colloquy.app/Contents/MacOS/Colloquy"; DEPLOYMENT_LOCATION = NO; DSTROOT = /tmp/FiSHy.dst; @@ -584,6 +586,7 @@ dynamic_lookup, ); PRODUCT_NAME = FiSHy; + SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk"; WRAPPER_EXTENSION = plugin; }; name = Release; @@ -591,7 +594,7 @@ 1DEB913F08733D840010E9CD /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - APPLICATION_VERSION = 0.4.0; + APPLICATION_VERSION = 0.4.1a1; COLLOQUY_SOURCE_FOLDER = ../colloquy; DEBUG_INFORMATION_FORMAT = dwarf; GCC_WARN_ABOUT_RETURN_TYPE = YES; @@ -602,7 +605,7 @@ ); OTHER_CFLAGS = "-DDEBUG"; PREBINDING = NO; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk"; SUBVERSION_INSTALL_DIR = /sw/bin; SYMROOT = "${COLLOQUY_SOURCE_FOLDER}/build"; }; @@ -611,9 +614,10 @@ 1DEB914008733D840010E9CD /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - APPLICATION_VERSION = 0.4.0; + APPLICATION_VERSION = 0.4.1a1; COLLOQUY_SOURCE_FOLDER = ../colloquy; DEBUG_INFORMATION_FORMAT = dwarf; + GCC_VERSION = 4.0; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ( @@ -621,7 +625,9 @@ "${COLLOQUY_SOURCE_FOLDER}/**", ); PREBINDING = NO; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk"; + "SDKROOT[arch=ppc64]" = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk"; + "SDKROOT[arch=x86_64]" = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk"; SUBVERSION_INSTALL_DIR = /sw/bin; SYMROOT = "${COLLOQUY_SOURCE_FOLDER}/build"; }; FiSHy.xcodeproj/project.pbxproj 948e10cffe36de2f628ec91a6f7a26bcb058490b Henning Kiel henning.kiel@gmail.com http://github.com/hennk/fishy/commit/01f610d7e0ce0383e6cdea1f80c1faf217710525 01f610d7e0ce0383e6cdea1f80c1faf217710525 2009-09-20T05:15:37-07:00 2009-09-20T05:15:37-07:00 Enabling 64bit universal compilation, not functional yet 04f7eaf4a64ec13c7cea1d0e01b93d3060d48552 Henning Kiel henning.kiel@gmail.com