Commit 91007c9

author

Tim Burks

committed

Debian Linux port, added gc support for Darwin.

1 parent af23680 commit 91007c9Copy full SHA for 91007c9

File tree

+10

-6

lines changed

+10

-6

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,12 +5,12 @@`
`5`	`5`	`(set SYSTEM ((NSString stringWithShellCommand:"uname") chomp))`
`6`	`6`	`(case SYSTEM`
`7`	`7`	`("Darwin"`
`8`		`- (set @cflags "-g -std=gnu99 -DDARWIN -I/usr/local/pgsql/include")`
	`8`	`+ (set @cflags "-g -fobjc-gc -std=gnu99 -DDARWIN -I/usr/local/pgsql/include")`
`9`	`9`	`(set @ldflags "-framework Foundation -framework Nu -lpq -L/usr/local/pgsql/lib"))`
`10`	`10`	`("Linux"`
`11`	`11`	`(set @arch (list "i386"))`
`12`		`- (set @cflags "-g -DLINUX -I/usr/local/pgsql/include -fconstant-string-class=NSConstantString ")`
`13`		`- (set @ldflags "-L/usr/local/lib -lNuFound -lNu -lpq -L/usr/local/pgsql/lib"))`
	`12`	`+ (set @cflags "-g -std=gnu99 -DLINUX -I/usr/include/GNUstep/Headers -I/usr/local/include -I/usr/local/pgsql/include -fconstant-string-class=NSConstantString ")`
	`13`	`+ (set @ldflags "-L/usr/local/lib -lNu -lpq -L/usr/local/pgsql/lib"))`
`14`	`14`	`(else nil))`
`15`	`15`
`16`	`16`	`;; framework description`
`@@ -30,7 +30,7 @@`
`30`	`30`
`31`	`31`	`(task "install" => "framework" is`
`32`	`32`	`(SH "sudo rm -rf /Library/Frameworks/#{@framework}.framework")`
`33`		`- (SH "ditto #{@framework}.framework /Library/Frameworks/#{@framework}.framework"))`
	`33`	`+ (SH "sudo cp -rp #{@framework}.framework /Library/Frameworks/#{@framework}.framework"))`
`34`	`34`
`35`	`35`	`(task "test" => "framework" is`
`36`	`36`	`(SH "nutest test/test_*.nu"))`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,8 @@`
`15`	`15`	`;; See the License for the specific language governing permissions and`
`16`	`16`	`;; limitations under the License.`
`17`	`17`
`18`		`-(class PGFieldType (ivar-accessors))`
	`18`	`+(class PGFieldType (ivar-accessors)`
	`19`	`+ (- (id) name is @name)) ;; required to avoid GNUstep conflict`
`19`	`20`
`20`	`21`	`(class PGResult (ivar-accessors)`
`21`	`22`	`(- (id) array is`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,10 @@ - (NSString *) connectionString`
`218`	`218`	`@"krbsrvname", @"service", nil];`
`219`	`219`
`220`	`220`	`NSMutableString *connectionString = [NSMutableString string];`
`221`		`- for (id key in [connectionInfo allKeys]) {`
	`221`	`+ NSArray *keys = [connectionInfo allKeys];`
	`222`	`+ int count = [keys count];`
	`223`	`+ for (int i = 0; i < count; i++) {`
	`224`	`+ id key = [keys objectAtIndex:i];`
`222`	`225`	`id value;`
`223`	`226`	`if ((value = [connectionInfo objectForKey:key])) {`
`224`	`227`	`[connectionString appendFormat:@" %@='%@'", key, value];`

Comments

(0)