diff --git a/ChangeLog b/ChangeLog index f7a747f19..2e1dde120 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-04-04 Stephane Corthesy + + * macosx/config.h, macosx/preface.h: Update. + * macosx/gnustep.pbproj/project/pbxproj: Use relative paths. + 2003-04-04 Adam Fedor * Source/Additions/GSCompatibility.m ([NSString(GSCompatibility) diff --git a/macosx/config.h b/macosx/config.h index 3de615d49..b5d1d72fe 100644 --- a/macosx/config.h +++ b/macosx/config.h @@ -27,6 +27,12 @@ #ifndef __config_h__ #define __config_h__ +#ifndef GNUSTEP_BASE_MAJOR_VERSION +#define GNUSTEP_BASE_MAJOR_VERSION 1 +#define GNUSTEP_BASE_MINOR_VERSION 6 +#define GNUSTEP_BASE_SUBMINOR_VERSION 0 +#endif + /* Define if Foundation implements KeyValueCoding. */ #define FOUNDATION_HAS_KVC 1 @@ -50,9 +56,17 @@ #define HAVE_STRERROR 1 #endif -//#define HAVE_LIBXML 1 -//#define HAVE_ICONV 1 -//#define HAVE_GICONV_H 1 +#ifndef HAVE_LIBXML +#define HAVE_LIBXML 1 +#endif + +#ifndef HAVE_ICONV +#define HAVE_ICONV 1 +#endif + +#ifndef HAVE_INET_ATON +#define HAVE_INET_ATON 1 +#endif #ifndef RCS_ID #define RCS_ID(name) \ diff --git a/macosx/gnustep.pbproj/project.pbxproj b/macosx/gnustep.pbproj/project.pbxproj index 4578c887b..ab88d0cc7 100644 --- a/macosx/gnustep.pbproj/project.pbxproj +++ b/macosx/gnustep.pbproj/project.pbxproj @@ -37,6 +37,8 @@ 034768DFFF38A50411DB9C8B = { children = ( 034768E0FF38A50411DB9C8B, + 55AB58710408D27700000001, + 554DDE7F04310FB500000001, ); isa = PBXGroup; name = Products; @@ -69,25 +71,21 @@ projectDirPath = ""; targets = ( 0867D69CFE84028FC02AAC07, + 55AB58700408D27700000001, + 554DDE7E04310FB500000001, ); }; 0867D691FE84028FC02AAC07 = { children = ( - 55F7D7E003E49D7700000001, + 5566CC2804324D9F00000002, + 5566CC2904324DA700000002, 556FFDF103EC37C700000001, 08FB77AEFE84172EC02AAC07, 32C88DFF0371C24200C91783, 089C1665FE841158C02AAC07, + 554DDE790430F9DB00000001, 0867D69AFE84028FC02AAC07, 034768DFFF38A50411DB9C8B, - 55F7D7D803E49C1000000001, - 55F7D7D903E49C1000000001, - 55F7D7DA03E49C1000000001, - 55F7D7DB03E49C1000000001, - 55F7D7DC03E49C1000000001, - 55F7D7DD03E49C1000000001, - 55F7D7DE03E49C1000000001, - 55F7D7DF03E49C1000000001, ); isa = PBXGroup; name = gnustep; @@ -116,16 +114,20 @@ 0867D69FFE84028FC02AAC07, 0867D6A0FE84028FC02AAC07, 0867D6A2FE84028FC02AAC07, + 55AB58490408D05A00000001, + 55AB588E0408DB4700000001, + 55AB58EB0408EADB00000001, + 554DDE87043110C200000001, ); buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; FRAMEWORK_SEARCH_PATHS = ""; - FRAMEWORK_VERSION = 1.5.1; - HEADER_SEARCH_PATHS = "\"${SOURCE_ROOT}/../Headers/gnustep\" \"${SOURCE_ROOT}/../Headers\" /sw/include"; - INSTALL_PATH = /Library/Frameworks; - LIBRARY_SEARCH_PATHS = /sw/lib; - OTHER_LDFLAGS = "-seg1addr 0x58000000"; + FRAMEWORK_VERSION = A; + HEADER_SEARCH_PATHS = "\"${SOURCE_ROOT}/../Headers/gnustep\" \"${SOURCE_ROOT}/../Headers\" /usr/local/include/libxml2 /sw/include"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LIBRARY_SEARCH_PATHS = "/usr/local/lib /sw/lib"; + OTHER_LDFLAGS = "-seg1addr 0x58000000 -headerpad_max_install_names"; PRECOMPILE_PREFIX_HEADER = YES; PREFIX_HEADER = config.h; PRODUCT_NAME = gnustep; @@ -137,7 +139,7 @@ ); isa = PBXFrameworkTarget; name = gnustep; - productInstallPath = /Library/Frameworks; + productInstallPath = "$(LOCAL_LIBRARY_DIR)/Frameworks"; productName = gnustep; productReference = 034768E0FF38A50411DB9C8B; productSettingsXML = " @@ -159,7 +161,7 @@ CFBundleSignature ???? CFBundleVersion - 1.5.1 + 1.6.0 NSPrincipalClass @@ -190,6 +192,7 @@ 556FFDEB03EC36E500000001, 556FFDEE03EC36E500000001, 555FEDB803EC450500000001, + 555112B403FEC81600000001, ); isa = PBXHeadersBuildPhase; runOnlyForDeploymentPostprocessing = 0; @@ -198,6 +201,7 @@ buildActionMask = 2147483647; files = ( 089C1668FE841158C02AAC07, + 554DDE86043110AA00000001, ); isa = PBXResourcesBuildPhase; runOnlyForDeploymentPostprocessing = 0; @@ -212,9 +216,11 @@ 55F7D5D703E48A7500000001, 55F7D5D903E48B8600000001, 55F7D5DA03E48B8700000001, - 55F7D5DD03E48BDD00000001, 55F7D5E003E48C8300000001, 55F7D5E303E48D0A00000001, + 555112B803FEC83800000001, + 55AB58310408CDFC00000001, + 55AB58320408CDFD00000001, ); isa = PBXSourcesBuildPhase; runOnlyForDeploymentPostprocessing = 0; @@ -223,6 +229,9 @@ buildActionMask = 2147483647; files = ( 55CF467E03E369AE00000001, + 55AB58330408CE0100000001, + 55AB58340408CE0200000001, + 55AB58350408CE0300000001, ); isa = PBXFrameworksBuildPhase; runOnlyForDeploymentPostprocessing = 0; @@ -236,7 +245,10 @@ }; 089C1665FE841158C02AAC07 = { children = ( + 55AB58E50408EA4D00000001, + 55AB588D0408D85E00000001, 089C1666FE841158C02AAC07, + 55AB585B0408D08700000001, ); isa = PBXGroup; name = Resources; @@ -295,7 +307,9 @@ children = ( 0867D69BFE84028FC02AAC07, 556FFD2C03EC331600000001, - 556FFD2D03EC331600000001, + 559CDB7E040587E100000001, + 559CDB8004058ACF00000001, + 55AB58870408D30500000001, ); isa = PBXGroup; name = "Linked Frameworks"; @@ -320,6 +334,9 @@ //324 32C88DFF0371C24200C91783 = { children = ( + 55F7D7E003E49D7700000001, + 555112B603FEC83800000001, + 55E1346E043268A100000002, ); isa = PBXGroup; name = "Other Sources"; @@ -335,12 +352,172 @@ //552 //553 //554 + 554DDE790430F9DB00000001 = { + children = ( + 55AB58740408D2A800000001, + 554DDE820431104D00000001, + ); + isa = PBXGroup; + name = Tools; + path = ../Tools; + refType = 4; + }; + 554DDE7A04310FB500000001 = { + buildActionMask = 2147483647; + files = ( + ); + isa = PBXHeadersBuildPhase; + runOnlyForDeploymentPostprocessing = 0; + }; + 554DDE7B04310FB500000001 = { + buildActionMask = 2147483647; + files = ( + 554DDE840431106D00000001, + ); + isa = PBXSourcesBuildPhase; + runOnlyForDeploymentPostprocessing = 0; + }; + 554DDE7C04310FB500000001 = { + buildActionMask = 2147483647; + files = ( + 554DDE890431135200000001, + ); + isa = PBXFrameworksBuildPhase; + runOnlyForDeploymentPostprocessing = 0; + }; + 554DDE7D04310FB500000001 = { + buildActionMask = 2147483647; + files = ( + ); + isa = PBXRezBuildPhase; + runOnlyForDeploymentPostprocessing = 0; + }; + 554DDE7E04310FB500000001 = { + buildPhases = ( + 554DDE7A04310FB500000001, + 554DDE7B04310FB500000001, + 554DDE7C04310FB500000001, + 554DDE7D04310FB500000001, + ); + buildSettings = { + INSTALL_PATH = /usr/local/bin; + OTHER_CFLAGS = ""; + OTHER_LDFLAGS = ""; + OTHER_REZFLAGS = ""; + PRECOMPILE_PREFIX_HEADER = YES; + PREFIX_HEADER = config.h; + PRODUCT_NAME = HTMLLinker; + REZ_EXECUTABLE = YES; + SECTORDER_FLAGS = ""; + WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas"; + }; + dependencies = ( + 554DDE8104310FBF00000001, + ); + isa = PBXToolTarget; + name = HTMLLinker; + productInstallPath = /usr/local/bin; + productName = HTMLLinker; + productReference = 554DDE7F04310FB500000001; + }; + 554DDE7F04310FB500000001 = { + isa = PBXExecutableFileReference; + path = HTMLLinker; + refType = 3; + }; + 554DDE8104310FBF00000001 = { + isa = PBXTargetDependency; + target = 0867D69CFE84028FC02AAC07; + }; + 554DDE820431104D00000001 = { + children = ( + 554DDE85043110AA00000001, + 554DDE830431106D00000001, + ); + isa = PBXGroup; + name = HTMLLinker; + refType = 4; + }; + 554DDE830431106D00000001 = { + fileEncoding = 30; + isa = PBXFileReference; + path = HTMLLinker.m; + refType = 4; + }; + 554DDE840431106D00000001 = { + fileRef = 554DDE830431106D00000001; + isa = PBXBuildFile; + settings = { + }; + }; + 554DDE85043110AA00000001 = { + fileEncoding = 30; + isa = PBXFileReference; + path = HTMLLinker.html; + refType = 4; + }; + 554DDE86043110AA00000001 = { + fileRef = 554DDE85043110AA00000001; + isa = PBXBuildFile; + settings = { + }; + }; + 554DDE87043110C200000001 = { + buildActionMask = 2147483647; + dstPath = English.lproj/Documentation; + dstSubfolderSpec = 7; + files = ( + 554DDE88043110E600000001, + ); + isa = PBXCopyFilesBuildPhase; + runOnlyForDeploymentPostprocessing = 0; + }; + 554DDE88043110E600000001 = { + fileRef = 554DDE85043110AA00000001; + isa = PBXBuildFile; + settings = { + }; + }; + 554DDE890431135200000001 = { + fileRef = 0867D69BFE84028FC02AAC07; + isa = PBXBuildFile; + settings = { + }; + }; + 555112B303FEC81600000001 = { + fileEncoding = 30; + isa = PBXFileReference; + path = "thr-mach.h"; + refType = 4; + }; + 555112B403FEC81600000001 = { + fileRef = 555112B303FEC81600000001; + isa = PBXBuildFile; + settings = { + ATTRIBUTES = ( + Public, + ); + }; + }; + 555112B603FEC83800000001 = { + fileEncoding = 30; + isa = PBXFileReference; + name = "thr-pthread.m"; + path = "../Source/thr-pthread.m"; + refType = 4; + }; + 555112B803FEC83800000001 = { + fileRef = 555112B603FEC83800000001; + isa = PBXBuildFile; + settings = { + }; + }; 555FEDB703EC450500000001 = { fileEncoding = 30; isa = PBXFileReference; name = GSCompatibility.h; - path = /Users/dave/Developer/gnustep/core/base/Source/Additions/GSCompatibility.h; - refType = 0; + path = ../../../Source/Additions/GSCompatibility.h; + refType = 4; }; 555FEDB803EC450500000001 = { fileRef = 555FEDB703EC450500000001; @@ -351,6 +528,28 @@ ); }; }; + 5566CC2804324D9F00000002 = { + fileEncoding = 30; + isa = PBXFileReference; + name = README; + path = ../macosx/README; + refType = 4; + }; + 5566CC2904324DA700000002 = { + children = ( + 55F7D7D803E49C1000000001, + 55F7D7D903E49C1000000001, + 55F7D7DA03E49C1000000001, + 55F7D7DB03E49C1000000001, + 55F7D7DC03E49C1000000001, + 55F7D7DD03E49C1000000001, + 55F7D7DE03E49C1000000001, + 55F7D7DF03E49C1000000001, + ); + isa = PBXGroup; + name = Docs; + refType = 4; + }; 556FFD1903EC2ECE00000001 = { children = ( 556FFD1A03EC2ECE00000001, @@ -482,12 +681,6 @@ path = /sw/lib/libiconv.dylib; refType = 0; }; - 556FFD2D03EC331600000001 = { - isa = PBXFileReference; - name = libxml.dylib; - path = /sw/lib/libxml.dylib; - refType = 0; - }; 556FFD2E03EC36E500000001 = { children = ( 556FFD3103EC36E500000001, @@ -502,6 +695,7 @@ 556FFD8B03EC36E500000001, 556FFD8D03EC36E500000001, 555FEDB703EC450500000001, + 555112B303FEC81600000001, ); isa = PBXGroup; name = base; @@ -673,6 +867,472 @@ name = Headers; refType = 4; }; + 559CDB7E040587E100000001 = { + isa = PBXFileReference; + name = libxml2.a; + path = /usr/local/lib/libxml2.a; + refType = 0; + }; + 559CDB8004058ACF00000001 = { + isa = PBXFileReference; + name = libz.dylib; + path = /usr/lib/libz.dylib; + refType = 0; + }; + 55AB58310408CDFC00000001 = { + fileRef = 55CF466903E367A500000001; + isa = PBXBuildFile; + settings = { + }; + }; + 55AB58320408CDFD00000001 = { + fileRef = 55CF466A03E367A500000001; + isa = PBXBuildFile; + settings = { + }; + }; + 55AB58330408CE0100000001 = { + fileRef = 556FFD2C03EC331600000001; + isa = PBXBuildFile; + settings = { + }; + }; + 55AB58340408CE0200000001 = { + fileRef = 559CDB7E040587E100000001; + isa = PBXBuildFile; + settings = { + }; + }; + 55AB58350408CE0300000001 = { + fileRef = 559CDB8004058ACF00000001; + isa = PBXBuildFile; + settings = { + }; + }; + 55AB58490408D05A00000001 = { + buildActionMask = 2147483647; + dstPath = Languages; + dstSubfolderSpec = 7; + files = ( + 55AB586B0408D09400000001, + ); + isa = PBXCopyFilesBuildPhase; + runOnlyForDeploymentPostprocessing = 0; + }; + 55AB585B0408D08700000001 = { + children = ( + 55AB58660408D08700000001, + ); + isa = PBXGroup; + name = Languages; + path = ../Resources/Languages; + refType = 4; + }; + 55AB58660408D08700000001 = { + fileEncoding = 30; + isa = PBXFileReference; + path = Locale.encodings; + refType = 4; + }; + 55AB586B0408D09400000001 = { + fileRef = 55AB58660408D08700000001; + isa = PBXBuildFile; + settings = { + }; + }; + 55AB586C0408D27700000001 = { + buildActionMask = 2147483647; + files = ( + 55AB587E0408D2DB00000001, + 55AB58800408D2DB00000001, + 55AB58820408D2DB00000001, + 55AB58840408D2DB00000001, + ); + isa = PBXHeadersBuildPhase; + runOnlyForDeploymentPostprocessing = 0; + }; + 55AB586D0408D27700000001 = { + buildActionMask = 2147483647; + files = ( + 55AB587F0408D2DB00000001, + 55AB58810408D2DB00000001, + 55AB58830408D2DB00000001, + 55AB58850408D2DB00000001, + 55AB58860408D2DB00000001, + ); + isa = PBXSourcesBuildPhase; + runOnlyForDeploymentPostprocessing = 0; + }; + 55AB586E0408D27700000001 = { + buildActionMask = 2147483647; + files = ( + 55AB58880408D30500000001, + 55AB58890408D30A00000001, + 55AB588A0408D30D00000001, + 55AB588B0408D30E00000001, + 55AB588C0408D30F00000001, + ); + isa = PBXFrameworksBuildPhase; + runOnlyForDeploymentPostprocessing = 0; + }; + 55AB586F0408D27700000001 = { + buildActionMask = 2147483647; + files = ( + ); + isa = PBXRezBuildPhase; + runOnlyForDeploymentPostprocessing = 0; + }; + 55AB58700408D27700000001 = { + buildPhases = ( + 55AB586C0408D27700000001, + 55AB586D0408D27700000001, + 55AB586E0408D27700000001, + 55AB586F0408D27700000001, + ); + buildSettings = { + INSTALL_PATH = /usr/local/bin; + LIBRARY_SEARCH_PATHS = /sw/lib; + OTHER_CFLAGS = ""; + OTHER_LDFLAGS = ""; + OTHER_REZFLAGS = ""; + PRECOMPILE_PREFIX_HEADER = YES; + PREFIX_HEADER = config.h; + PRODUCT_NAME = autogsdoc; + REZ_EXECUTABLE = YES; + SECTORDER_FLAGS = ""; + WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas"; + }; + dependencies = ( + 55AB58730408D28300000001, + ); + isa = PBXToolTarget; + name = autogsdoc; + productInstallPath = /usr/local/bin; + productName = autogsdoc; + productReference = 55AB58710408D27700000001; + }; + 55AB58710408D27700000001 = { + isa = PBXExecutableFileReference; + path = autogsdoc; + refType = 3; + }; + 55AB58730408D28300000001 = { + isa = PBXTargetDependency; + target = 0867D69CFE84028FC02AAC07; + }; + 55AB58740408D2A800000001 = { + children = ( + 55AB58750408D2DB00000001, + 55AB58760408D2DB00000001, + 55AB58770408D2DB00000001, + 55AB58780408D2DB00000001, + 55AB58790408D2DB00000001, + 55AB587A0408D2DB00000001, + 55AB587B0408D2DB00000001, + 55AB587C0408D2DB00000001, + 55AB587D0408D2DB00000001, + ); + isa = PBXGroup; + name = autogsdoc; + path = ""; + refType = 4; + }; + 55AB58750408D2DB00000001 = { + fileEncoding = 30; + isa = PBXFileReference; + path = AGSHtml.h; + refType = 4; + }; + 55AB58760408D2DB00000001 = { + fileEncoding = 30; + isa = PBXFileReference; + path = AGSHtml.m; + refType = 4; + }; + 55AB58770408D2DB00000001 = { + fileEncoding = 30; + isa = PBXFileReference; + path = AGSIndex.h; + refType = 4; + }; + 55AB58780408D2DB00000001 = { + fileEncoding = 30; + isa = PBXFileReference; + path = AGSIndex.m; + refType = 4; + }; + 55AB58790408D2DB00000001 = { + fileEncoding = 30; + isa = PBXFileReference; + path = AGSOutput.h; + refType = 4; + }; + 55AB587A0408D2DB00000001 = { + fileEncoding = 30; + isa = PBXFileReference; + path = AGSOutput.m; + refType = 4; + }; + 55AB587B0408D2DB00000001 = { + fileEncoding = 30; + isa = PBXFileReference; + path = AGSParser.h; + refType = 4; + }; + 55AB587C0408D2DB00000001 = { + fileEncoding = 30; + isa = PBXFileReference; + path = AGSParser.m; + refType = 4; + }; + 55AB587D0408D2DB00000001 = { + fileEncoding = 30; + isa = PBXFileReference; + path = autogsdoc.m; + refType = 4; + }; + 55AB587E0408D2DB00000001 = { + fileRef = 55AB58750408D2DB00000001; + isa = PBXBuildFile; + settings = { + }; + }; + 55AB587F0408D2DB00000001 = { + fileRef = 55AB58760408D2DB00000001; + isa = PBXBuildFile; + settings = { + }; + }; + 55AB58800408D2DB00000001 = { + fileRef = 55AB58770408D2DB00000001; + isa = PBXBuildFile; + settings = { + }; + }; + 55AB58810408D2DB00000001 = { + fileRef = 55AB58780408D2DB00000001; + isa = PBXBuildFile; + settings = { + }; + }; + 55AB58820408D2DB00000001 = { + fileRef = 55AB58790408D2DB00000001; + isa = PBXBuildFile; + settings = { + }; + }; + 55AB58830408D2DB00000001 = { + fileRef = 55AB587A0408D2DB00000001; + isa = PBXBuildFile; + settings = { + }; + }; + 55AB58840408D2DB00000001 = { + fileRef = 55AB587B0408D2DB00000001; + isa = PBXBuildFile; + settings = { + }; + }; + 55AB58850408D2DB00000001 = { + fileRef = 55AB587C0408D2DB00000001; + isa = PBXBuildFile; + settings = { + }; + }; + 55AB58860408D2DB00000001 = { + fileRef = 55AB587D0408D2DB00000001; + isa = PBXBuildFile; + settings = { + }; + }; + 55AB58870408D30500000001 = { + isa = PBXFrameworkReference; + path = gnustep.framework; + refType = 3; + }; + 55AB58880408D30500000001 = { + fileRef = 55AB58870408D30500000001; + isa = PBXBuildFile; + settings = { + }; + }; + 55AB58890408D30A00000001 = { + fileRef = 0867D69BFE84028FC02AAC07; + isa = PBXBuildFile; + settings = { + }; + }; + 55AB588A0408D30D00000001 = { + fileRef = 556FFD2C03EC331600000001; + isa = PBXBuildFile; + settings = { + }; + }; + 55AB588B0408D30E00000001 = { + fileRef = 559CDB7E040587E100000001; + isa = PBXBuildFile; + settings = { + }; + }; + 55AB588C0408D30F00000001 = { + fileRef = 559CDB8004058ACF00000001; + isa = PBXBuildFile; + settings = { + }; + }; + 55AB588D0408D85E00000001 = { + children = ( + 55AB588F0408DB7200000001, + 55AB58900408DB7200000001, + 55AB58910408DB7200000001, + 55AB58920408DB7200000001, + 55AB58EA0408EA8100000001, + ); + isa = PBXGroup; + name = DTDs; + refType = 4; + }; + 55AB588E0408DB4700000001 = { + buildActionMask = 2147483647; + dstPath = DTDs; + dstSubfolderSpec = 7; + files = ( + 55AB58930408DB7A00000001, + 55AB58940408DB7A00000001, + 55AB58950408DB7A00000001, + 55AB58960408DB7A00000001, + 55AB58EE0408EB0300000001, + ); + isa = PBXCopyFilesBuildPhase; + runOnlyForDeploymentPostprocessing = 0; + }; + 55AB588F0408DB7200000001 = { + fileEncoding = 30; + isa = PBXFileReference; + name = "gsdoc-0_6_5.dtd"; + path = "../Tools/gsdoc-0_6_5.dtd"; + refType = 4; + }; + 55AB58900408DB7200000001 = { + fileEncoding = 30; + isa = PBXFileReference; + name = "gsdoc-0_6_6.dtd"; + path = "../Tools/gsdoc-0_6_6.dtd"; + refType = 4; + }; + 55AB58910408DB7200000001 = { + fileEncoding = 30; + isa = PBXFileReference; + name = "gsdoc-0_6_7.dtd"; + path = "../Tools/gsdoc-0_6_7.dtd"; + refType = 4; + }; + 55AB58920408DB7200000001 = { + fileEncoding = 30; + isa = PBXFileReference; + name = "gsdoc-1_0_0.dtd"; + path = "../Tools/gsdoc-1_0_0.dtd"; + refType = 4; + }; + 55AB58930408DB7A00000001 = { + fileRef = 55AB588F0408DB7200000001; + isa = PBXBuildFile; + settings = { + }; + }; + 55AB58940408DB7A00000001 = { + fileRef = 55AB58900408DB7200000001; + isa = PBXBuildFile; + settings = { + }; + }; + 55AB58950408DB7A00000001 = { + fileRef = 55AB58910408DB7200000001; + isa = PBXBuildFile; + settings = { + }; + }; + 55AB58960408DB7A00000001 = { + fileRef = 55AB58920408DB7200000001; + isa = PBXBuildFile; + settings = { + }; + }; + 55AB58E50408EA4D00000001 = { + children = ( + 55AB58E60408EA8100000001, + 55AB58E70408EA8100000001, + 55AB58E80408EA8100000001, + 55AB58E90408EA8100000001, + ); + isa = PBXGroup; + name = DocTemplates; + refType = 4; + }; + 55AB58E60408EA8100000001 = { + fileEncoding = 30; + isa = PBXFileReference; + name = AutoDocTemplate.gsdoc; + path = ../Tools/AutoDocTemplate.gsdoc; + refType = 4; + }; + 55AB58E70408EA8100000001 = { + fileEncoding = 30; + isa = PBXFileReference; + name = gnustep.gsdoc; + path = ../Tools/gnustep.gsdoc; + refType = 4; + }; + 55AB58E80408EA8100000001 = { + fileEncoding = 30; + isa = PBXFileReference; + name = gsdoc.gsdoc; + path = ../Tools/gsdoc.gsdoc; + refType = 4; + }; + 55AB58E90408EA8100000001 = { + fileEncoding = 30; + isa = PBXFileReference; + name = indextemplate.gsdoc; + path = ../Tools/indextemplate.gsdoc; + refType = 4; + }; + 55AB58EA0408EA8100000001 = { + fileEncoding = 30; + isa = PBXFileReference; + name = "plist-0_9.dtd"; + path = "../Tools/plist-0_9.dtd"; + refType = 4; + }; + 55AB58EB0408EADB00000001 = { + buildActionMask = 2147483647; + dstPath = DocTemplates; + dstSubfolderSpec = 7; + files = ( + 55AB58EC0408EAEE00000001, + 55AB58ED0408EAEE00000001, + ); + isa = PBXCopyFilesBuildPhase; + runOnlyForDeploymentPostprocessing = 0; + }; + 55AB58EC0408EAEE00000001 = { + fileRef = 55AB58E60408EA8100000001; + isa = PBXBuildFile; + settings = { + }; + }; + 55AB58ED0408EAEE00000001 = { + fileRef = 55AB58E90408EA8100000001; + isa = PBXBuildFile; + settings = { + }; + }; + 55AB58EE0408EB0300000001 = { + fileRef = 55AB58EA0408EA8100000001; + isa = PBXBuildFile; + settings = { + }; + }; 55CF465F03E367A500000001 = { fileEncoding = 30; isa = PBXFileReference; @@ -767,7 +1427,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "myHeaderDir=\"${BUILD_ROOT}/`dirname ${INNER_PRODUCT_SUBPATH}`/Headers\"\nmkdir ${myHeaderDir}/base\ncd ${myHeaderDir}/base\ntest -f behavior.h || ln -s ../behavior.h .\ntest -f objc-gnu2next.h || ln -s ../objc-gnu2next.h .\ntest -f preface.h || ln -s ../preface.h .\ntest -f GCObject.h || ln -s ../GCObject.h .\ntest -f GNUstep.h || ln -s ../GNUstep.h .\ntest -f GSCategories.h || ln -s ../GSCategories.h .\ntest -f GSCompatibility.h || ln -s ../GSCompatibility.h .\ntest -f GSMime.h || ln -s ../GSMime.h .\ntest -f GSXML.h || ln -s ../GSXML.h .\ntest -f GSObjCRuntime.h || ln -s ../GSObjCRuntime.h ."; + shellScript = "myHeaderDir=\"${BUILD_ROOT}/`dirname ${INNER_PRODUCT_SUBPATH}`/Headers\"\nmkdir ${myHeaderDir}/base\ncd ${myHeaderDir}/base\ntest -f behavior.h || ln -s ../behavior.h .\ntest -f objc-gnu2next.h || ln -s ../objc-gnu2next.h .\ntest -f preface.h || ln -s ../preface.h .\ntest -f GCObject.h || ln -s ../GCObject.h .\ntest -f GNUstep.h || ln -s ../GNUstep.h .\ntest -f GSCategories.h || ln -s ../GSCategories.h .\ntest -f GSCompatibility.h || ln -s ../GSCompatibility.h .\ntest -f GSMime.h || ln -s ../GSMime.h .\ntest -f GSXML.h || ln -s ../GSXML.h .\ntest -f GSObjCRuntime.h || ln -s ../GSObjCRuntime.h .\ntest -f Unicode.h || ln -s ../Unicode.h .\ntest -f thr-mach.h || ln -s ../thr-mach.h ."; }; 55CF467E03E369AE00000001 = { fileRef = 0867D69BFE84028FC02AAC07; @@ -775,6 +1435,13 @@ settings = { }; }; + 55E1346E043268A100000002 = { + fileEncoding = 30; + isa = PBXFileReference; + name = GSPrivate.h; + path = ../Source/GSPrivate.h; + refType = 4; + }; 55F7D5D003E4072000000001 = { fileRef = 55CF466703E367A500000001; isa = PBXBuildFile; @@ -811,12 +1478,6 @@ settings = { }; }; - 55F7D5DD03E48BDD00000001 = { - fileRef = 55CF466903E367A500000001; - isa = PBXBuildFile; - settings = { - }; - }; 55F7D5E003E48C8300000001 = { fileRef = 55CF466303E367A500000001; isa = PBXBuildFile; @@ -833,57 +1494,57 @@ fileEncoding = 30; isa = PBXFileReference; name = ANNOUNCE; - path = /Users/dave/Developer/gnustep/core/base/ANNOUNCE; - refType = 0; + path = ../ANNOUNCE; + refType = 4; }; 55F7D7D903E49C1000000001 = { fileEncoding = 30; isa = PBXFileReference; name = BUGS; - path = /Users/dave/Developer/gnustep/core/base/BUGS; - refType = 0; + path = ../BUGS; + refType = 4; }; 55F7D7DA03E49C1000000001 = { fileEncoding = 30; isa = PBXFileReference; name = ChangeLog; - path = /Users/dave/Developer/gnustep/core/base/ChangeLog; - refType = 0; + path = ../ChangeLog; + refType = 4; }; 55F7D7DB03E49C1000000001 = { fileEncoding = 30; isa = PBXFileReference; name = COPYING; - path = /Users/dave/Developer/gnustep/core/base/COPYING; - refType = 0; + path = ../COPYING; + refType = 4; }; 55F7D7DC03E49C1000000001 = { fileEncoding = 30; isa = PBXFileReference; name = COPYING.LIB; - path = /Users/dave/Developer/gnustep/core/base/COPYING.LIB; - refType = 0; + path = ../COPYING.LIB; + refType = 4; }; 55F7D7DD03E49C1000000001 = { fileEncoding = 30; isa = PBXFileReference; name = INSTALL; - path = /Users/dave/Developer/gnustep/core/base/INSTALL; - refType = 0; + path = ../INSTALL; + refType = 4; }; 55F7D7DE03E49C1000000001 = { fileEncoding = 30; isa = PBXFileReference; name = NEWS; - path = /Users/dave/Developer/gnustep/core/base/NEWS; - refType = 0; + path = ../NEWS; + refType = 4; }; 55F7D7DF03E49C1000000001 = { fileEncoding = 30; isa = PBXFileReference; name = README; - path = /Users/dave/Developer/gnustep/core/base/README; - refType = 0; + path = ../README; + refType = 4; }; 55F7D7E003E49D7700000001 = { fileEncoding = 30; diff --git a/macosx/preface.h b/macosx/preface.h index 08050911f..8c2bfb851 100644 --- a/macosx/preface.h +++ b/macosx/preface.h @@ -92,9 +92,9 @@ /* The following group of lines maintained by the gstep-base configure */ #define GNUSTEP_BASE_VERSION @VERSION@ -#define GNUSTEP_BASE_MAJOR_VERSION @MAJOR_VERSION@ -#define GNUSTEP_BASE_MINOR_VERSION @MINOR_VERSION@ -#define GNUSTEP_BASE_SUBMINOR_VERSION @SUBMINOR_VERSION@ +#define GNUSTEP_BASE_MAJOR_VERSION 1 +#define GNUSTEP_BASE_MINOR_VERSION 6 +#define GNUSTEP_BASE_SUBMINOR_VERSION 0 #define GNUSTEP_BASE_GCC_VERSION @GCC_VERSION@ #if 0