From: znek Date: Tue, 2 Nov 2004 16:12:51 +0000 (+0000) Subject: Embed .sxp products within the NGObjWeb framework's wrapper X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d339c03611f0c7baaa460609e0210e26c9741ceb;p=sope Embed .sxp products within the NGObjWeb framework's wrapper git-svn-id: http://svn.opengroupware.org/SOPE/trunk@331 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- diff --git a/sope-appserver/ChangeLog b/sope-appserver/ChangeLog index 1201e171..0dc20ebf 100644 --- a/sope-appserver/ChangeLog +++ b/sope-appserver/ChangeLog @@ -1,3 +1,8 @@ +2004-11-02 Marcus Mueller + + * sope-appserver.xcode: adjusted the build process to new NGObjWeb + targets. + 2004-09-22 Marcus Mueller * README-OSX.txt: minor changes to the prebinding documentation. The diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog index 98c82249..453a89e2 100644 --- a/sope-appserver/NGObjWeb/ChangeLog +++ b/sope-appserver/NGObjWeb/ChangeLog @@ -1,3 +1,16 @@ +2004-11-02 Marcus Mueller + + * v4.3.81 + + * NGObjWeb.xcode: added new targets to the build process to make + embedding of SoProducts within the framework's wrapper possible. + + * SoObjects/SoProductRegistry.m: fixed crash bug on Cocoa Foundation + that occurred during product registration. As a new feature added + search for products within framework's "SoProducts" resource + directory. This can be used as a fallback, suitable for wrapper + targets that want to use "SoObjects" functionality. + 2004-11-01 Helge Hess * WebDAV/SoWebDAVRenderer.m: added support for multiple resource type diff --git a/sope-appserver/NGObjWeb/NGObjWeb.xcode/project.pbxproj b/sope-appserver/NGObjWeb/NGObjWeb.xcode/project.pbxproj index 7e725fb2..266b483b 100644 --- a/sope-appserver/NGObjWeb/NGObjWeb.xcode/project.pbxproj +++ b/sope-appserver/NGObjWeb/NGObjWeb.xcode/project.pbxproj @@ -181,6 +181,200 @@ settings = { }; }; + AD20BADF0737DB50002A6594 = { + buildPhases = ( + ); + buildSettings = { + OPTIMIZATION_CFLAGS = ""; + OTHER_CFLAGS = ""; + OTHER_LDFLAGS = ""; + OTHER_REZFLAGS = ""; + PRODUCT_NAME = all; + SECTORDER_FLAGS = ""; + WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas"; + }; + dependencies = ( + AD20BB0A0737E57B002A6594, + AD20BAE60737DB8B002A6594, + AD20BAE80737DB96002A6594, + AD20BB0C0737E57B002A6594, + ); + isa = PBXAggregateTarget; + name = all; + productName = all; + }; + AD20BAE20737DB6F002A6594 = { + buildPhases = ( + ); + buildSettings = { + OPTIMIZATION_CFLAGS = ""; + OTHER_CFLAGS = ""; + OTHER_LDFLAGS = ""; + OTHER_REZFLAGS = ""; + PRODUCT_NAME = Products; + SECTORDER_FLAGS = ""; + WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas"; + }; + dependencies = ( + AD20BAE40737DB7B002A6594, + ); + isa = PBXAggregateTarget; + name = SoProducts; + productName = Products; + }; + AD20BAE30737DB7B002A6594 = { + containerPortal = ADD65B6A06DA32D6007161CA; + isa = PBXContainerItemProxy; + proxyType = 1; + remoteGlobalIDString = ADFE6FFD06E2765E006628C4; + remoteInfo = "SoCore (SXP)"; + }; + AD20BAE40737DB7B002A6594 = { + isa = PBXTargetDependency; + target = ADFE6FFD06E2765E006628C4; + targetProxy = AD20BAE30737DB7B002A6594; + }; + AD20BAE50737DB8B002A6594 = { + containerPortal = ADD65B6A06DA32D6007161CA; + isa = PBXContainerItemProxy; + proxyType = 1; + remoteGlobalIDString = ADD65D5706DA372D007161CA; + remoteInfo = NGObjWeb; + }; + AD20BAE60737DB8B002A6594 = { + isa = PBXTargetDependency; + target = ADD65D5706DA372D007161CA; + targetProxy = AD20BAE50737DB8B002A6594; + }; + AD20BAE70737DB96002A6594 = { + containerPortal = ADD65B6A06DA32D6007161CA; + isa = PBXContainerItemProxy; + proxyType = 1; + remoteGlobalIDString = AD20BAE20737DB6F002A6594; + remoteInfo = Products; + }; + AD20BAE80737DB96002A6594 = { + isa = PBXTargetDependency; + target = AD20BAE20737DB6F002A6594; + targetProxy = AD20BAE70737DB96002A6594; + }; + AD20BB060737E529002A6594 = { + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + isa = PBXShellScriptBuildPhase; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "rm -f /tmp/NGObjWebBundledSoProductsDestinationPath\nrm -rf /tmp/NGObjWebBundledSoProducts\nexit 0"; + }; + AD20BB070737E529002A6594 = { + buildPhases = ( + AD20BB060737E529002A6594, + ); + buildSettings = { + OPTIMIZATION_CFLAGS = ""; + OTHER_CFLAGS = ""; + OTHER_LDFLAGS = ""; + OTHER_REZFLAGS = ""; + PRODUCT_NAME = CleanProducts; + SECTORDER_FLAGS = ""; + WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas"; + }; + dependencies = ( + ); + isa = PBXAggregateTarget; + name = CleanSoProducts; + productName = CleanProducts; + }; + AD20BB090737E57B002A6594 = { + containerPortal = ADD65B6A06DA32D6007161CA; + isa = PBXContainerItemProxy; + proxyType = 1; + remoteGlobalIDString = AD20BB070737E529002A6594; + remoteInfo = CleanSoProducts; + }; + AD20BB0A0737E57B002A6594 = { + isa = PBXTargetDependency; + target = AD20BB070737E529002A6594; + targetProxy = AD20BB090737E57B002A6594; + }; + AD20BB0B0737E57B002A6594 = { + containerPortal = ADD65B6A06DA32D6007161CA; + isa = PBXContainerItemProxy; + proxyType = 1; + remoteGlobalIDString = AD20BB030737E515002A6594; + remoteInfo = CopySoProducts; + }; + AD20BB0C0737E57B002A6594 = { + isa = PBXTargetDependency; + target = AD20BB100737E5AC002A6594; + targetProxy = AD20BB0B0737E57B002A6594; + }; + AD20BB0F0737E5AC002A6594 = { + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + isa = PBXShellScriptBuildPhase; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "SOPRODUCTS=/tmp/NGObjWebBundledSoProducts\nSOPRODUCTS_DEST=`cat /tmp/NGObjWebBundledSoProductsDestinationPath `\n\nif [ ! -d ${SOPRODUCTS} ]; then\n #error\n exit 1\nfi\n\nmkdir -p ${SOPRODUCTS_DEST}\ncp -pR ${SOPRODUCTS}/* ${SOPRODUCTS_DEST}\nexit 0\n"; + }; + AD20BB100737E5AC002A6594 = { + buildPhases = ( + AD20BB0F0737E5AC002A6594, + ); + buildSettings = { + OPTIMIZATION_CFLAGS = ""; + OTHER_CFLAGS = ""; + OTHER_LDFLAGS = ""; + OTHER_REZFLAGS = ""; + PRODUCT_NAME = CopySoProducts; + SECTORDER_FLAGS = ""; + WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas"; + }; + dependencies = ( + ); + isa = PBXAggregateTarget; + name = CopySoProducts; + productName = CopySoProducts; + }; + AD20BB2C0737E693002A6594 = { + buildActionMask = 2147483647; + dstPath = /tmp/NGObjWebBundledSoProducts; + dstSubfolderSpec = 0; + files = ( + AD20BB2D0737E6B4002A6594, + ); + isa = PBXCopyFilesBuildPhase; + runOnlyForDeploymentPostprocessing = 0; + }; + AD20BB2D0737E6B4002A6594 = { + fileRef = ADFE6FFE06E2765E006628C4; + isa = PBXBuildFile; + settings = { + }; + }; + AD343B390736A2D2000A795C = { + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + isa = PBXShellScriptBuildPhase; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "echo \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SoProducts\" > /tmp/NGObjWebBundledSoProductsDestinationPath\nexit 0"; + }; AD51811206FF7ED0006397CD = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; @@ -314,6 +508,10 @@ targets = ( ADD65D5706DA372D007161CA, ADFE6FFD06E2765E006628C4, + AD20BADF0737DB50002A6594, + AD20BAE20737DB6F002A6594, + AD20BB070737E529002A6594, + AD20BB100737E5AC002A6594, ); }; ADD65C6F06DA343C007161CA = { @@ -815,6 +1013,7 @@ ADD65D5406DA372D007161CA, ADD65D5506DA372D007161CA, ADD65D5606DA372D007161CA, + AD343B390736A2D2000A795C, ); buildRules = ( ); @@ -6645,6 +6844,7 @@ ADFE6FFA06E2765E006628C4, ADFE6FFB06E2765E006628C4, ADFE6FFC06E2765E006628C4, + AD20BB2C0737E693002A6594, ); buildRules = ( ); diff --git a/sope-appserver/NGObjWeb/SoObjects/SoProductRegistry.m b/sope-appserver/NGObjWeb/SoObjects/SoProductRegistry.m index 0ca64d38..eb433edb 100644 --- a/sope-appserver/NGObjWeb/SoObjects/SoProductRegistry.m +++ b/sope-appserver/NGObjWeb/SoObjects/SoProductRegistry.m @@ -246,6 +246,8 @@ static int debugOn = 0; #if !COCOA_Foundation_LIBRARY relPath = @"Library/"; +#else + relPath = @""; #endif relPath = [NSString stringWithFormat:@"%@SoProducts-%i.%i/", relPath, SOPE_MAJOR_VERSION, SOPE_MINOR_VERSION]; @@ -263,7 +265,14 @@ static int debugOn = 0; [self debugWithFormat:@" directory %@", lPath]; [self scanForProductsInDirectory:lPath]; } - + +#if COCOA_Foundation_LIBRARY + /* look in wrapper places */ + bundle = [NSBundle bundleForClass:[self class]]; + relPath = [[bundle resourcePath] + stringByAppendingPathComponent:@"SoProducts"]; + [self scanForProductsInDirectory:relPath]; +#endif /* look into FHS pathes */ relPath = [NSString stringWithFormat:@"lib/sope-%i.%i/products/", diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version index ca086d87..a74f4bdc 100644 --- a/sope-appserver/NGObjWeb/Version +++ b/sope-appserver/NGObjWeb/Version @@ -1,6 +1,6 @@ # version file -SUBMINOR_VERSION:=80 +SUBMINOR_VERSION:=81 # v4.3.42 requires libNGExtensions v4.3.116 # v4.3.40 requires libNGExtensions v4.3.115 diff --git a/sope-appserver/sope-appserver.xcode/project.pbxproj b/sope-appserver/sope-appserver.xcode/project.pbxproj index 5747a612..d871104f 100644 --- a/sope-appserver/sope-appserver.xcode/project.pbxproj +++ b/sope-appserver/sope-appserver.xcode/project.pbxproj @@ -5,6 +5,18 @@ }; objectVersion = 39; objects = { + AD20BB4B0737E7DA002A6594 = { + containerPortal = AD915D0A06E29B43004720C2; + isa = PBXContainerItemProxy; + proxyType = 1; + remoteGlobalIDString = AD20BADF0737DB50002A6594; + remoteInfo = all; + }; + AD20BB4C0737E7DA002A6594 = { + isa = PBXTargetDependency; + name = "all (from NGObjWeb.xcode)"; + targetProxy = AD20BB4B0737E7DA002A6594; + }; AD8BEFED07005D9B00EC239A = { isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; @@ -203,18 +215,6 @@ remoteRef = AD915D2F06E29BAC004720C2; sourceTree = BUILT_PRODUCTS_DIR; }; - AD915D2606E29B83004720C2 = { - containerPortal = AD915D0A06E29B43004720C2; - isa = PBXContainerItemProxy; - proxyType = 1; - remoteGlobalIDString = ADD65D5706DA372D007161CA; - remoteInfo = NGObjWeb; - }; - AD915D2706E29B83004720C2 = { - isa = PBXTargetDependency; - name = "NGObjWeb (from NGObjWeb.xcode)"; - targetProxy = AD915D2606E29B83004720C2; - }; AD915D2806E29B83004720C2 = { containerPortal = AD915D0C06E29B51004720C2; isa = PBXContainerItemProxy; @@ -457,7 +457,7 @@ AD8BEFF807005E1A00EC239A, AD8BEFFA07005E2500EC239A, AD8BEFFC07005E2D00EC239A, - AD915D2706E29B83004720C2, + AD20BB4C0737E7DA002A6594, AD915D2B06E29B83004720C2, AD915D2906E29B83004720C2, );