From: <haw...@us...> - 2008-11-13 16:22:59
|
Revision: 216 http://pgsqlformac.svn.sourceforge.net/pgsqlformac/?rev=216&view=rev Author: hawkmoon Date: 2008-11-13 16:22:55 +0000 (Thu, 13 Nov 2008) Log Message: ----------- 8.3.5 Release Modified Paths: -------------- trunk/Automator/PostgreSQL Dynamic Query Action/Info.plist trunk/Automator/PostgreSQL Query Action/Info.plist trunk/CreateDatabase/Info.plist trunk/CreateUser/Create User.xcodeproj/arsatori.pbxuser trunk/CreateUser/Create User.xcodeproj/project.pbxproj trunk/CreateUser/Info.plist trunk/CreateUser/PGNewUserUI.h trunk/CreateUser/PGNewUserUI.m trunk/Installers/PostgreSQL for Mac/PostgreSQL for Mac.pmdoc/01postgresql.xml trunk/Installers/PostgreSQL for Mac/PostgreSQL for Mac.pmdoc/02postgresql.xml trunk/Installers/PostgreSQL for Mac/PostgreSQL for Mac.pmdoc/index.xml trunk/PGSQLKit/Info.plist trunk/PreferencePane/PostgreSQL Server/English.lproj/PostgreSQL_ServerPref.xib trunk/PreferencePane/PostgreSQL Server/Info.plist trunk/PreferencePane/PostgreSQL Server/PostgreSQL_ServerPref.m trunk/StartupHelper/main.c trunk/StartupItem/.DS_Store trunk/pgCocoaDB/Info.plist Modified: trunk/Automator/PostgreSQL Dynamic Query Action/Info.plist =================================================================== --- trunk/Automator/PostgreSQL Dynamic Query Action/Info.plist 2008-11-13 15:26:24 UTC (rev 215) +++ trunk/Automator/PostgreSQL Dynamic Query Action/Info.plist 2008-11-13 16:22:55 UTC (rev 216) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> <key>AMAccepts</key> @@ -93,7 +93,7 @@ <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> - <string>1.0</string> + <string>8.3.5</string> <key>NSPrincipalClass</key> <string>PostgreSQL_Dynamic_Query_Action</string> </dict> Modified: trunk/Automator/PostgreSQL Query Action/Info.plist =================================================================== --- trunk/Automator/PostgreSQL Query Action/Info.plist 2008-11-13 15:26:24 UTC (rev 215) +++ trunk/Automator/PostgreSQL Query Action/Info.plist 2008-11-13 16:22:55 UTC (rev 216) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> <key>AMAccepts</key> @@ -84,7 +84,7 @@ <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> - <string>1.0</string> + <string>8.3.5</string> <key>NSPrincipalClass</key> <string>PostgreSQL_Query_Action</string> </dict> Modified: trunk/CreateDatabase/Info.plist =================================================================== --- trunk/CreateDatabase/Info.plist 2008-11-13 15:26:24 UTC (rev 215) +++ trunk/CreateDatabase/Info.plist 2008-11-13 16:22:55 UTC (rev 216) @@ -17,7 +17,7 @@ <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> - <string>8.3.2</string> + <string>8.3.5</string> <key>NSMainNibFile</key> <string>MainMenu</string> <key>NSPrincipalClass</key> Modified: trunk/CreateUser/Create User.xcodeproj/arsatori.pbxuser =================================================================== --- trunk/CreateUser/Create User.xcodeproj/arsatori.pbxuser 2008-11-13 15:26:24 UTC (rev 215) +++ trunk/CreateUser/Create User.xcodeproj/arsatori.pbxuser 2008-11-13 16:22:55 UTC (rev 216) @@ -12,12 +12,26 @@ 43F67E640CBC623400B36845 /* Create User */, ); perUserDictionary = { + PBXConfiguration.PBXFileTableDataSource3.PBXBookmarksDataSource = { + PBXFileTableDataSourceColumnSortingDirectionKey = "-1"; + PBXFileTableDataSourceColumnSortingKey = PBXBookmarksDataSource_NameID; + PBXFileTableDataSourceColumnWidthsKey = ( + 200, + 200, + 83.58349609375, + ); + PBXFileTableDataSourceColumnsKey = ( + PBXBookmarksDataSource_LocationID, + PBXBookmarksDataSource_NameID, + PBXBookmarksDataSource_CommentsID, + ); + }; PBXConfiguration.PBXFileTableDataSource3.PBXFileTableDataSource = { PBXFileTableDataSourceColumnSortingDirectionKey = "-1"; PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID; PBXFileTableDataSourceColumnWidthsKey = ( 20, - 247, + 693, 20, 48, 43, @@ -39,7 +53,7 @@ PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID; PBXFileTableDataSourceColumnWidthsKey = ( 20, - 207, + 234, 60, 20, 48, @@ -56,21 +70,96 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 247023369; - PBXWorkspaceStateSaveDate = 247023369; + PBXPerProjectTemplateStateSaveDate = 248284821; + PBXWorkspaceStateSaveDate = 248284821; }; + perUserProjectItems = { + 436C843F0ECC88C0007996FD /* PBXTextBookmark */ = 436C843F0ECC88C0007996FD /* PBXTextBookmark */; + 436C84400ECC88C0007996FD /* PBXTextBookmark */ = 436C84400ECC88C0007996FD /* PBXTextBookmark */; + 436C84410ECC88C0007996FD /* PBXTextBookmark */ = 436C84410ECC88C0007996FD /* PBXTextBookmark */; + 436C84420ECC88C0007996FD /* PBXTextBookmark */ = 436C84420ECC88C0007996FD /* PBXTextBookmark */; + 436C84430ECC88C0007996FD /* PBXTextBookmark */ = 436C84430ECC88C0007996FD /* PBXTextBookmark */; + 436C84440ECC88C0007996FD /* PBXTextBookmark */ = 436C84440ECC88C0007996FD /* PBXTextBookmark */; + }; sourceControlManager = 43F67E700CBC623B00B36845 /* Source Control */; userBuildSettings = { }; }; + 434CDC6E07CAD73E000F3026 /* PGNewUserUI.h */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {871, 802}}"; + sepNavSelRange = "{1084, 0}"; + sepNavVisRange = "{0, 1091}"; + }; + }; 434CDC6F07CAD73E000F3026 /* PGNewUserUI.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {859, 2686}}"; - sepNavSelRange = "{2474, 22}"; - sepNavVisRange = "{2049, 663}"; + sepNavIntBoundsRect = "{{0, 0}, {871, 2604}}"; + sepNavSelRange = "{2611, 18}"; + sepNavVisRange = "{1041, 1591}"; sepNavWindowFrame = "{{15, 63}, {674, 1110}}"; }; }; + 436C843F0ECC88C0007996FD /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 434CDC6E07CAD73E000F3026 /* PGNewUserUI.h */; + name = "PGNewUserUI.h: 42"; + rLen = 0; + rLoc = 1084; + rType = 0; + vrLen = 1091; + vrLoc = 0; + }; + 436C84400ECC88C0007996FD /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 434CDC6F07CAD73E000F3026 /* PGNewUserUI.m */; + name = "PGNewUserUI.m: 115"; + rLen = 18; + rLoc = 2611; + rType = 0; + vrLen = 1696; + vrLoc = 1334; + }; + 436C84410ECC88C0007996FD /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 434CDC6E07CAD73E000F3026 /* PGNewUserUI.h */; + name = "PGNewUserUI.h: 31"; + rLen = 0; + rLoc = 826; + rType = 0; + vrLen = 1069; + vrLoc = 0; + }; + 436C84420ECC88C0007996FD /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 434CDC6F07CAD73E000F3026 /* PGNewUserUI.m */; + name = "PGNewUserUI.m: 115"; + rLen = 18; + rLoc = 2611; + rType = 0; + vrLen = 1457; + vrLoc = 1437; + }; + 436C84430ECC88C0007996FD /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 434CDC6E07CAD73E000F3026 /* PGNewUserUI.h */; + name = "PGNewUserUI.h: 42"; + rLen = 0; + rLoc = 1084; + rType = 0; + vrLen = 1091; + vrLoc = 0; + }; + 436C84440ECC88C0007996FD /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 434CDC6F07CAD73E000F3026 /* PGNewUserUI.m */; + name = "PGNewUserUI.m: 115"; + rLen = 18; + rLoc = 2611; + rType = 0; + vrLen = 1591; + vrLoc = 1041; + }; 43F67E640CBC623400B36845 /* Create User */ = { isa = PBXExecutable; activeArgIndices = ( @@ -78,7 +167,7 @@ argumentStrings = ( ); autoAttachOnCrash = 1; - breakpointsEnabled = 1; + breakpointsEnabled = 0; configStateDict = { }; customDataFormattersEnabled = 1; Modified: trunk/CreateUser/Create User.xcodeproj/project.pbxproj =================================================================== --- trunk/CreateUser/Create User.xcodeproj/project.pbxproj 2008-11-13 15:26:24 UTC (rev 215) +++ trunk/CreateUser/Create User.xcodeproj/project.pbxproj 2008-11-13 16:22:55 UTC (rev 216) @@ -11,8 +11,8 @@ 434CDC7107CAD73E000F3026 /* PGNewUserUI.m in Sources */ = {isa = PBXBuildFile; fileRef = 434CDC6F07CAD73E000F3026 /* PGNewUserUI.m */; }; 434CDC9307CADA42000F3026 /* create_user_wiz.png in Resources */ = {isa = PBXBuildFile; fileRef = 434CDC9207CADA42000F3026 /* create_user_wiz.png */; }; 434CDDD407CC3F41000F3026 /* add user_32.icns in Resources */ = {isa = PBXBuildFile; fileRef = 434CDDD307CC3F41000F3026 /* add user_32.icns */; }; - 437617F70EB947330067C28F /* pgCocoaDB.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 437617F60EB947330067C28F /* pgCocoaDB.framework */; }; - 437617FA0EB9473A0067C28F /* pgCocoaDB.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 437617F60EB947330067C28F /* pgCocoaDB.framework */; }; + 436D43DA0EBA112F003BE656 /* PGSQLKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 436D43D90EBA112F003BE656 /* PGSQLKit.framework */; }; + 436D43DD0EBA1135003BE656 /* PGSQLKit.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 436D43D90EBA112F003BE656 /* PGSQLKit.framework */; }; 8D11072A0486CEB800E47090 /* MainMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = 29B97318FDCFA39411CA2CEA /* MainMenu.nib */; }; 8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; }; 8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; }; @@ -26,7 +26,7 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 437617FA0EB9473A0067C28F /* pgCocoaDB.framework in CopyFiles */, + 436D43DD0EBA1135003BE656 /* PGSQLKit.framework in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -44,7 +44,7 @@ 434CDC6F07CAD73E000F3026 /* PGNewUserUI.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PGNewUserUI.m; sourceTree = "<group>"; }; 434CDC9207CADA42000F3026 /* create_user_wiz.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = create_user_wiz.png; sourceTree = "<group>"; }; 434CDDD307CC3F41000F3026 /* add user_32.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = "add user_32.icns"; sourceTree = "<group>"; }; - 437617F60EB947330067C28F /* pgCocoaDB.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = pgCocoaDB.framework; path = ../pgCocoaDB/build/Deployment/pgCocoaDB.framework; sourceTree = SOURCE_ROOT; }; + 436D43D90EBA112F003BE656 /* PGSQLKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PGSQLKit.framework; path = ../PGSQLKit/build/Release/PGSQLKit.framework; sourceTree = SOURCE_ROOT; }; 8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; }; 8D1107320486CEB800E47090 /* Create User.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Create User.app"; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ @@ -55,7 +55,7 @@ buildActionMask = 2147483647; files = ( 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */, - 437617F70EB947330067C28F /* pgCocoaDB.framework in Frameworks */, + 436D43DA0EBA112F003BE656 /* PGSQLKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -74,7 +74,7 @@ 1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = { isa = PBXGroup; children = ( - 437617F60EB947330067C28F /* pgCocoaDB.framework */, + 436D43D90EBA112F003BE656 /* PGSQLKit.framework */, 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */, ); name = "Linked Frameworks"; @@ -232,8 +232,10 @@ FRAMEWORK_SEARCH_PATHS = ( ../pgCocoaDB/build, "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", ); FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../pgCocoaDB/build/Deployment\""; + FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../PGSQLKit/build/Release\""; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; @@ -259,8 +261,10 @@ FRAMEWORK_SEARCH_PATHS = ( ../pgCocoaDB/build, "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", ); FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../pgCocoaDB/build/Deployment\""; + FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../PGSQLKit/build/Release\""; GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -281,8 +285,10 @@ FRAMEWORK_SEARCH_PATHS = ( ../pgCocoaDB/build, "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", + "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", ); FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../pgCocoaDB/build/Deployment\""; + FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../PGSQLKit/build/Release\""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Create User_Prefix.pch"; Modified: trunk/CreateUser/Info.plist =================================================================== --- trunk/CreateUser/Info.plist 2008-11-13 15:26:24 UTC (rev 215) +++ trunk/CreateUser/Info.plist 2008-11-13 16:22:55 UTC (rev 216) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> <key>CFBundleDevelopmentRegion</key> @@ -17,7 +17,7 @@ <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> - <string>8.1.0</string> + <string>8.3.5</string> <key>NSMainNibFile</key> <string>MainMenu</string> <key>NSPrincipalClass</key> Modified: trunk/CreateUser/PGNewUserUI.h =================================================================== --- trunk/CreateUser/PGNewUserUI.h 2008-11-13 15:26:24 UTC (rev 215) +++ trunk/CreateUser/PGNewUserUI.h 2008-11-13 16:22:55 UTC (rev 216) @@ -3,15 +3,12 @@ // Create User // // Created by Andy Satori on 2/21/05. -// Copyright 2005 __MyCompanyName__. All rights reserved. +// Copyright 2005 Druware Software Designs. All rights reserved. // #import <Cocoa/Cocoa.h> -#import <pgCocoaDB/Connection.h> -#import <pgCocoaDB/Databases.h> -#import <pgCocoaDB/RecordSet.h> +#import <PGSQLKit/PGSQLKit.h> - @interface PGNewUserUI : NSObject { IBOutlet NSButton *back; @@ -35,10 +32,13 @@ IBOutlet NSButton *allowCreateUser; IBOutlet NSButton *versionSevenFeaturesOnly; - Connection *_conn; + PGSQLConnection *_conn; } - (IBAction)onBack:(id)sender; - (IBAction)onCancel:(id)sender; - (IBAction)onNext:(id)sender; + +- (void)createUser; + @end Modified: trunk/CreateUser/PGNewUserUI.m =================================================================== --- trunk/CreateUser/PGNewUserUI.m 2008-11-13 15:26:24 UTC (rev 215) +++ trunk/CreateUser/PGNewUserUI.m 2008-11-13 16:22:55 UTC (rev 216) @@ -24,7 +24,7 @@ { BOOL isRunning = NO; - _conn = [[[[Connection alloc] init] autorelease] retain]; + _conn = [[[[PGSQLConnection alloc] init] autorelease] retain]; // set the defaults [groups removeAllItems]; @@ -57,7 +57,7 @@ if ([[user stringValue] length] == 0) { return; } [_conn setUserName:[user stringValue]]; - [_conn setHost:[server stringValue]]; + [_conn setServer:[server stringValue]]; [_conn setPort:[port stringValue]]; [_conn setPassword:[password stringValue]]; @@ -68,7 +68,7 @@ NSAlert *alert = [NSAlert alertWithMessageText:@"Database Connection failed" defaultButton:@"OK" alternateButton:nil - otherButton:nil informativeTextWithFormat:@"%@", [_conn errorDescription]]; + otherButton:nil informativeTextWithFormat:@"%@", [_conn lastError]]; [alert beginSheetModalForWindow:[NSApp mainWindow] modalDelegate:nil didEndSelector:nil contextInfo:nil]; return; } @@ -77,11 +77,11 @@ [groups addItemWithTitle:@"- default -"]; // load the rest from a quick query of the database - RecordSet *rs = [_conn execQuery:@"select groname from pg_group order by groname asc"]; + PGSQLRecordset *rs = [_conn open:@"select groname from pg_group order by groname asc"]; int i ; - for (i = 0; i < [rs count]; i++) + for (i = 0; i < [rs recordCount]; i++) { - [groups addItemWithTitle:[[[[rs itemAtIndex:i] fields] itemAtIndex:0] value]]; + [groups addItemWithTitle:[[rs fieldByIndex:i] asString]]; } [back setEnabled:YES]; @@ -181,7 +181,7 @@ { if ([_conn isConnected]) { - [_conn disconnect]; + [_conn close]; [_conn release]; _conn = nil; } Modified: trunk/Installers/PostgreSQL for Mac/PostgreSQL for Mac.pmdoc/01postgresql.xml =================================================================== --- trunk/Installers/PostgreSQL for Mac/PostgreSQL for Mac.pmdoc/01postgresql.xml 2008-11-13 15:26:24 UTC (rev 215) +++ trunk/Installers/PostgreSQL for Mac/PostgreSQL for Mac.pmdoc/01postgresql.xml 2008-11-13 16:22:55 UTC (rev 216) @@ -1 +1 @@ -<pkgref spec="1.12" uuid="0CE0FB3E-841F-4ECB-A530-576853338088"><config><identifier>com.druware.postgresqlformac.postgresqlForMac.postgresql8.pkg</identifier><version>8.3.4</version><description></description><post-install type="none"/><requireAuthorization/><installFrom mod="true" includeRoot="true">/var/tmp/merge/Universal/Library/PostgreSQL8</installFrom><installTo mod="true">/Library/</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>parent</mod><mod>scripts.postinstall.path</mod><mod>scripts.postflight.path</mod><mod>scripts.postupgrade.path</mod><mod>version</mod><mod>includeRoot</mod><mod>installFrom.path</mod><mod>installTo</mod><mod>installTo.path</mod></config><scripts><postflight mod="true">/Users/arsatori/Projects/PostgreSQL/postflight</postflight><postinstall mod="true">/Users/arsatori/Projects/PostgreSQL/postinstall</postinstall><postupgrade mod="true">/Users/arsatori/Projects/PostgreSQL/postupgrade</postupgrade></scripts><contents><file-list>01postgresql-contents.xml</file-list><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="0CE0FB3E-841F-4ECB-A530-576853338088"><config><identifier>com.druware.postgresqlformac.postgresqlForMac.postgresql8.pkg</identifier><version>8.3.5</version><description></description><post-install type="none"/><requireAuthorization/><installFrom mod="true" includeRoot="true">/var/tmp/merge/Universal/Library/PostgreSQL8</installFrom><installTo mod="true">/Library/</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>parent</mod><mod>scripts.postinstall.path</mod><mod>scripts.postflight.path</mod><mod>scripts.postupgrade.path</mod><mod>version</mod><mod>includeRoot</mod><mod>installFrom.path</mod><mod>installTo</mod><mod>installTo.path</mod></config><scripts><postflight mod="true">/Users/arsatori/Projects/PostgreSQL/postflight</postflight><postinstall mod="true">/Users/arsatori/Projects/PostgreSQL/postinstall</postinstall><postupgrade mod="true">/Users/arsatori/Projects/PostgreSQL/postupgrade</postupgrade></scripts><contents><file-list>01postgresql-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref> \ No newline at end of file Modified: trunk/Installers/PostgreSQL for Mac/PostgreSQL for Mac.pmdoc/02postgresql.xml =================================================================== --- trunk/Installers/PostgreSQL for Mac/PostgreSQL for Mac.pmdoc/02postgresql.xml 2008-11-13 15:26:24 UTC (rev 215) +++ trunk/Installers/PostgreSQL for Mac/PostgreSQL for Mac.pmdoc/02postgresql.xml 2008-11-13 16:22:55 UTC (rev 216) @@ -1 +1 @@ -<pkgref spec="1.12" uuid="A6D3C252-8A0E-40F3-8D65-9EE2D626B073"><config><identifier>com.druware.postgresqlformac.postgresqlForMac.postgresql.pkg</identifier><version>8.3.4</version><description></description><post-install type="none"/><requireAuthorization/><installFrom mod="true" includeRoot="true">/Users/arsatori/Projects/PostgreSQL/svn/trunk/StartupItem/PostgreSQL</installFrom><installTo mod="true">/Library/StartupItems/</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>parent</mod><mod>version</mod><mod>installTo.path</mod><mod>includeRoot</mod><mod>installTo</mod></config><contents><file-list>02postgresql-contents.xml</file-list><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="A6D3C252-8A0E-40F3-8D65-9EE2D626B073"><config><identifier>com.druware.postgresqlformac.postgresqlForMac.postgresql.pkg</identifier><version>8.3.5</version><description></description><post-install type="none"/><requireAuthorization/><installFrom mod="true" includeRoot="true">/Users/arsatori/Projects/PostgreSQL/svn/trunk/StartupItem/PostgreSQL</installFrom><installTo mod="true">/Library/StartupItems/</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>parent</mod><mod>version</mod><mod>installTo.path</mod><mod>includeRoot</mod><mod>installTo</mod></config><contents><file-list>02postgresql-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref> \ No newline at end of file Modified: trunk/Installers/PostgreSQL for Mac/PostgreSQL for Mac.pmdoc/index.xml =================================================================== --- trunk/Installers/PostgreSQL for Mac/PostgreSQL for Mac.pmdoc/index.xml 2008-11-13 15:26:24 UTC (rev 215) +++ trunk/Installers/PostgreSQL for Mac/PostgreSQL for Mac.pmdoc/index.xml 2008-11-13 16:22:55 UTC (rev 216) @@ -1,4 +1,4 @@ -<pkmkdoc spec="1.12"><properties><title>PostgreSQL for Mac</title><build>/Users/arsatori/Desktop/PostgreSQL for Mac.mpkg</build><organization>com.druware.postgresqlformac</organization><userSees ui="both"/><min-target os="2"/><domain system="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><description>Installs a full PostgreSQL Database server environment on Mac OS X.</description><contents><choice title="Database Server" id="choice0" description="The core of the PostgreSQL for Mac deployment, this is the PostgreSQL Database engine, packaged and installed to the /Library/PostgreSQL location." starts_selected="true" starts_enabled="false" starts_hidden="false"><pkgref id="com.druware.postgresqlformac.postgresqlForMac.postgresql8.pkg"/><choice title="StartUp Item" id="choice1" starts_selected="true" starts_enabled="false" starts_hidden="false"><pkgref id="com.druware.postgresqlformac.postgresqlForMac.postgresql.pkg"/></choice><choice title="Server Applications" id="choice5" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="com.druware.postgresqlformac.postgresqlForMac.serviceManager.pkg"/><pkgref id="com.druware.postgresqlformac.postgresqlForMac.cleaninstallation.pkg"/><pkgref id="com.druware.postgresqlformac.postgresqlForMac.queryToolForPostgres.pkg"/><pkgref id="com.druware.postgresqlformac.postgresqlForMac.createDatabase.pkg"/><pkgref id="com.druware.postgresqlformac.postgresqlForMac.createUser.pkg"/></choice></choice><choice title="Database Access Toolkits" id="choice3" starts_selected="true" starts_enabled="true" starts_hidden="false"><choice title="Java (JDBC3)" id="choice6" description="Recommended JDBC Driver for Java 1.5." starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="com.druware.postgresqlformac.postgresqlForMac.postgresql83603jdbc3.pkg"/></choice><choice title="PGSQLKit Framework" id="choice11" description="PGSQLKit Framework for development and deployment of linked applications " starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="com.druware.postgresqlformac.postgresqlForMac.pgsqlkit.pkg"/></choice></choice></contents><resources bg-scale="tofit" bg-align="bottomleft"><locale lang="en"><resource type="background">/Users/arsatori/Projects/PostgreSQL/svn/trunk/Installers/PostgreSQL/Resources/background.tif</resource><resource mime-type="text/rtf" kind="embedded" type="license"><![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf350 +<pkmkdoc spec="1.12"><properties><title>PostgreSQL for Mac</title><build>/Users/arsatori/Desktop/PostgreSQL for Mac.mpkg</build><organization>com.druware.postgresqlformac</organization><userSees ui="both"/><min-target os="2"/><domain system="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><description>Installs a full PostgreSQL Database server environment on Mac OS X.</description><contents><choice title="Database Server" id="choice0" description="The core of the PostgreSQL for Mac deployment, this is the PostgreSQL Database engine, packaged and installed to the /Library/PostgreSQL location." starts_selected="true" starts_enabled="false" starts_hidden="false"><pkgref id="com.druware.postgresqlformac.postgresqlForMac.postgresql8.pkg"/><choice title="StartUp Item" id="choice1" starts_selected="true" starts_enabled="false" starts_hidden="false"><pkgref id="com.druware.postgresqlformac.postgresqlForMac.postgresql.pkg"/></choice><choice title="Server Applications" id="choice5" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="com.druware.postgresqlformac.postgresqlForMac.queryToolForPostgres.pkg"/><pkgref id="com.druware.postgresqlformac.postgresqlForMac.createDatabase.pkg"/><pkgref id="com.druware.postgresqlformac.postgresqlForMac.createUser.pkg"/></choice></choice><choice title="Database Access Toolkits" id="choice3" starts_selected="true" starts_enabled="true" starts_hidden="false"><choice title="Java (JDBC3)" id="choice6" description="Recommended JDBC Driver for Java 1.5." starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="com.druware.postgresqlformac.postgresqlForMac.postgresql83603jdbc3.pkg"/></choice><choice title="PGSQLKit Framework" id="choice11" description="PGSQLKit Framework for development and deployment of linked applications " starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="com.druware.postgresqlformac.postgresqlForMac.pgsqlkit.pkg"/></choice></choice></contents><resources bg-scale="tofit" bg-align="bottomleft"><locale lang="en"><resource type="background">/Users/arsatori/Projects/PostgreSQL/svn/trunk/Installers/PostgreSQL/Resources/background.tif</resource><resource mime-type="text/rtf" kind="embedded" type="license"><![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf350 {\fonttbl\f0\fnil\fcharset0 Verdana;\f1\fmodern\fcharset0 Courier;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural @@ -50,4 +50,4 @@ \b must \b0 shut down the running copy, and it is strongly recommended that you take a few moments to make a full backup of your databases before you upgrade.\cf0 \ \ -Thank you for choosing PostgreSQL.}]]></resource></locale></resources><flags/><item type="file">01postgresql.xml</item><item type="file">02postgresql.xml</item><item type="file">03service.xml</item><item type="file">04postgresql.xml</item><item type="file">05pgsqlkit.xml</item><item type="file">06clean.xml</item><item type="file">07query.xml</item><item type="file">08create.xml</item><item type="file">09create.xml</item><mod>properties.customizeOption</mod><mod>properties.title</mod><mod>description</mod><mod>properties.systemDomain</mod><mod>properties.anywhereDomain</mod></pkmkdoc> \ No newline at end of file +Thank you for choosing PostgreSQL.}]]></resource></locale></resources><flags/><item type="file">01postgresql.xml</item><item type="file">02postgresql.xml</item><item type="file">03postgresql.xml</item><item type="file">04pgsqlkit.xml</item><item type="file">05query.xml</item><item type="file">06create.xml</item><item type="file">07create.xml</item><mod>properties.customizeOption</mod><mod>properties.title</mod><mod>description</mod><mod>properties.systemDomain</mod><mod>properties.anywhereDomain</mod></pkmkdoc> \ No newline at end of file Modified: trunk/PGSQLKit/Info.plist =================================================================== --- trunk/PGSQLKit/Info.plist 2008-11-13 15:26:24 UTC (rev 215) +++ trunk/PGSQLKit/Info.plist 2008-11-13 16:22:55 UTC (rev 216) @@ -19,7 +19,7 @@ <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> - <string>8.3.4</string> + <string>8.3.5</string> <key>NSPrincipalClass</key> <string></string> </dict> Modified: trunk/PreferencePane/PostgreSQL Server/English.lproj/PostgreSQL_ServerPref.xib =================================================================== --- trunk/PreferencePane/PostgreSQL Server/English.lproj/PostgreSQL_ServerPref.xib 2008-11-13 15:26:24 UTC (rev 215) +++ trunk/PreferencePane/PostgreSQL Server/English.lproj/PostgreSQL_ServerPref.xib 2008-11-13 16:22:55 UTC (rev 216) @@ -642,10 +642,6 @@ <string key="NSClassName">NSImage</string> <string key="NSResourceName">lock_32</string> </object> - <object class="NSCustomResource" key="NSAlternateImage"> - <string key="NSClassName">NSImage</string> - <string key="NSResourceName">ulock_32</string> - </object> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> <int key="NSPeriodicDelay">400</int> Modified: trunk/PreferencePane/PostgreSQL Server/Info.plist =================================================================== --- trunk/PreferencePane/PostgreSQL Server/Info.plist 2008-11-13 15:26:24 UTC (rev 215) +++ trunk/PreferencePane/PostgreSQL Server/Info.plist 2008-11-13 16:22:55 UTC (rev 216) @@ -21,7 +21,7 @@ <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> - <string>1.0</string> + <string>8.3.5</string> <key>NSMainNibFile</key> <string>PostgreSQL_ServerPref</string> <key>NSPrefPaneIconFile</key> Modified: trunk/PreferencePane/PostgreSQL Server/PostgreSQL_ServerPref.m =================================================================== --- trunk/PreferencePane/PostgreSQL Server/PostgreSQL_ServerPref.m 2008-11-13 15:26:24 UTC (rev 215) +++ trunk/PreferencePane/PostgreSQL Server/PostgreSQL_ServerPref.m 2008-11-13 16:22:55 UTC (rev 216) @@ -24,8 +24,10 @@ thisBundle = [NSBundle bundleWithIdentifier:@"com.druware.postgresqlserverpreferences"]; isLocked = YES; + + [self onTimedUpdate:nil]; - [self performSelector:@selector(onTimedUpdate:) withObject:self afterDelay:0.1]; +// [self performSelector:@selector(onTimedUpdate:) withObject:self afterDelay:0.1]; } #pragma mark -- @@ -82,7 +84,6 @@ - (IBAction)toggleLock:(id)sender { - NSLog(@"got isLocked"); if (isLocked) { [self unlockPane]; @@ -98,7 +99,6 @@ return; } - #pragma mark -- #pragma mark Status Update Handlers Modified: trunk/StartupHelper/main.c =================================================================== --- trunk/StartupHelper/main.c 2008-11-13 15:26:24 UTC (rev 215) +++ trunk/StartupHelper/main.c 2008-11-13 16:22:55 UTC (rev 216) @@ -2,6 +2,8 @@ #include <sys/types.h> #include <unistd.h> +#include <stdlib.h> +#include <string.h> int main (int argc, const char * argv[]) { // insert code here... Modified: trunk/StartupItem/.DS_Store =================================================================== --- trunk/StartupItem/.DS_Store 2008-11-13 15:26:24 UTC (rev 215) +++ trunk/StartupItem/.DS_Store 2008-11-13 16:22:55 UTC (rev 216) @@ -1,3 +1,5 @@ - |