mirror of
https://github.com/gnustep/libs-gsweb.git
synced 2025-02-15 08:01:24 +00:00
rename all *.framework top level directories to their basename.
* GSWDatabase/WODisplayGroup.m remove local NSAutoreleasePool adjust makefiles git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@30698 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Dave Wetzel
parent
93f2b82324
commit
bd96878757
409 changed files with 25 additions and 23 deletions
|
|
@ -1,3 +1,9 @@
|
||||||
|
2010-06-13 David Wetzel <dave@turbocat.de>
|
||||||
|
rename all *.framework top level directories to their basename.
|
||||||
|
* GSWDatabase/WODisplayGroup.m
|
||||||
|
remove local NSAutoreleasePool
|
||||||
|
adjust makefiles
|
||||||
|
|
||||||
2010-06-13 David Wetzel <dave@turbocat.de>
|
2010-06-13 David Wetzel <dave@turbocat.de>
|
||||||
* Examples/hello/Main.m
|
* Examples/hello/Main.m
|
||||||
add DirectAction to avoid error messages
|
add DirectAction to avoid error messages
|
||||||
|
|
|
||||||
|
|
@ -30,9 +30,9 @@ include ./config.mak
|
||||||
#
|
#
|
||||||
# The list of subproject directories
|
# The list of subproject directories
|
||||||
#
|
#
|
||||||
SUBPROJECTS = GSWeb.framework \
|
SUBPROJECTS = GSWeb \
|
||||||
GSWExtensions.framework \
|
GSWExtensions \
|
||||||
GSWExtensionsGSW.framework \
|
GSWExtensionsGSW \
|
||||||
GSWDatabase
|
GSWDatabase
|
||||||
|
|
||||||
#GSWAdaptors
|
#GSWAdaptors
|
||||||
|
|
|
||||||
|
|
@ -1110,7 +1110,6 @@ shouldRedisplayForEditingContextChangeNotification:notification];
|
||||||
{
|
{
|
||||||
EOUndoManager* undoManager=nil;
|
EOUndoManager* undoManager=nil;
|
||||||
NSArray *objects=nil;
|
NSArray *objects=nil;
|
||||||
NSAutoreleasePool* arp = nil;
|
|
||||||
|
|
||||||
[[NSNotificationCenter defaultCenter]
|
[[NSNotificationCenter defaultCenter]
|
||||||
postNotificationName:@"WODisplayGroupWillFetch" //TODO Name
|
postNotificationName:@"WODisplayGroupWillFetch" //TODO Name
|
||||||
|
|
@ -1125,7 +1124,6 @@ shouldRedisplayForEditingContextChangeNotification:notification];
|
||||||
[_dataSource setQualifierBindings:_queryBindings];
|
[_dataSource setQualifierBindings:_queryBindings];
|
||||||
}
|
}
|
||||||
|
|
||||||
arp = [NSAutoreleasePool new];
|
|
||||||
NS_DURING
|
NS_DURING
|
||||||
{
|
{
|
||||||
objects = [_dataSource fetchObjects];
|
objects = [_dataSource fetchObjects];
|
||||||
|
|
@ -1136,12 +1134,10 @@ shouldRedisplayForEditingContextChangeNotification:notification];
|
||||||
{
|
{
|
||||||
NSLog(@"%@ (%@)",localException,[localException reason]);
|
NSLog(@"%@ (%@)",localException,[localException reason]);
|
||||||
RETAIN(localException);
|
RETAIN(localException);
|
||||||
DESTROY(arp);
|
|
||||||
AUTORELEASE(localException);
|
AUTORELEASE(localException);
|
||||||
[localException raise];
|
[localException raise];
|
||||||
}
|
}
|
||||||
NS_ENDHANDLER;
|
NS_ENDHANDLER;
|
||||||
DESTROY(arp);
|
|
||||||
|
|
||||||
if (_delegateRespondsTo.didFetchObjects)
|
if (_delegateRespondsTo.didFetchObjects)
|
||||||
[_delegate displayGroup:self
|
[_delegate displayGroup:self
|
||||||
|
|
|
||||||
|
|
@ -90,9 +90,9 @@ endif
|
||||||
# contained in the GSWWOCompatibility.h header.
|
# contained in the GSWWOCompatibility.h header.
|
||||||
# Currently this script is rather aggresive as it doesn't identify
|
# Currently this script is rather aggresive as it doesn't identify
|
||||||
# whole words but merely patterns.
|
# whole words but merely patterns.
|
||||||
GSWWOReplaceScript.sed: ../GSWeb.framework/GSWWOCompatibility.h
|
GSWWOReplaceScript.sed: ../GSWeb/GSWWOCompatibility.h
|
||||||
$(ECHO_NOTHING)grep "^#define[[:space:]]*GSW.*[[:space:]]*WO.*" \
|
$(ECHO_NOTHING)grep "^#define[[:space:]]*GSW.*[[:space:]]*WO.*" \
|
||||||
../GSWeb.framework/GSWWOCompatibility.h | \
|
../GSWeb/GSWWOCompatibility.h | \
|
||||||
sed -e 's/#define /s\//' \
|
sed -e 's/#define /s\//' \
|
||||||
-e 's/[[:space:]*]/\//' \
|
-e 's/[[:space:]*]/\//' \
|
||||||
-e 's/[[:space:]*]//g' \
|
-e 's/[[:space:]*]//g' \
|
||||||
|
|
@ -101,7 +101,7 @@ GSWWOReplaceScript.sed: ../GSWeb.framework/GSWWOCompatibility.h
|
||||||
|
|
||||||
# The script is copied instead of referenced as the relative path
|
# The script is copied instead of referenced as the relative path
|
||||||
# from the $@ directory is unknown. Keep this rule in sync with
|
# from the $@ directory is unknown. Keep this rule in sync with
|
||||||
# GSWExtensionsGSW.framework/Makefile.postamble
|
# GSWExtensionsGSW/Makefile.postamble
|
||||||
$(WOExtensions_COMPONENTS) $(WO_LOCALIZED_COMPONENTS): GSWWOReplaceScript.sed
|
$(WOExtensions_COMPONENTS) $(WO_LOCALIZED_COMPONENTS): GSWWOReplaceScript.sed
|
||||||
$(ECHO_NOTHING)cp -r $(subst .wo,.gswc,$(subst WO,GSW, $@)) $@ && \
|
$(ECHO_NOTHING)cp -r $(subst .wo,.gswc,$(subst WO,GSW, $@)) $@ && \
|
||||||
cp GSWWOReplaceScript.sed $@ && \
|
cp GSWWOReplaceScript.sed $@ && \
|
||||||
|
|
@ -64,8 +64,8 @@ ADDITIONAL_CFLAGS =
|
||||||
|
|
||||||
# Additional include directories the compiler should search
|
# Additional include directories the compiler should search
|
||||||
ADDITIONAL_INCLUDE_DIRS = \
|
ADDITIONAL_INCLUDE_DIRS = \
|
||||||
-I../GSWeb.framework/$(GNUSTEP_TARGET_DIR) \
|
-I../GSWeb/$(GNUSTEP_TARGET_DIR) \
|
||||||
-I../GSWeb.framework/derived_src
|
-I../GSWeb/derived_src
|
||||||
|
|
||||||
# Additional LDFLAGS to pass to the linker
|
# Additional LDFLAGS to pass to the linker
|
||||||
ADDITIONAL_LDFLAGS =
|
ADDITIONAL_LDFLAGS =
|
||||||
|
|
@ -97,11 +97,11 @@ endif
|
||||||
ADDITIONAL_LIB_DIRS =
|
ADDITIONAL_LIB_DIRS =
|
||||||
|
|
||||||
ifeq ($(HAVE_NATIVE_FRAMEWORK_SUPPORT),yes)
|
ifeq ($(HAVE_NATIVE_FRAMEWORK_SUPPORT),yes)
|
||||||
ADDITIONAL_FRAMEWORK_DIRS = -F../GSWeb.framework
|
ADDITIONAL_FRAMEWORK_DIRS = -F../GSWeb
|
||||||
else
|
else
|
||||||
#This is needed to strip GSW/WOExtensions from GNUSTEP_OBJ_DIR
|
#This is needed to strip GSW/WOExtensions from GNUSTEP_OBJ_DIR
|
||||||
GSWEB_LIBRARY_BASE = ../GSWeb.framework/GSWeb.framework
|
GSWEB_LIBRARY_BASE = ../GSWeb/GSWeb.framework
|
||||||
WO_LIBRARY_BASE = ../GSWeb.framework/WebObjects.framework
|
WO_LIBRARY_BASE = ../GSWeb/WebObjects.framework
|
||||||
GSW_FRAMEWORK_SUFFIX = Versions/Current/$(GNUSTEP_TARGET_LDIR)
|
GSW_FRAMEWORK_SUFFIX = Versions/Current/$(GNUSTEP_TARGET_LDIR)
|
||||||
|
|
||||||
GSWExtensions_LIB_DIRS = \
|
GSWExtensions_LIB_DIRS = \
|
||||||
|
Before Width: | Height: | Size: 179 B After Width: | Height: | Size: 179 B |
|
Before Width: | Height: | Size: 177 B After Width: | Height: | Size: 177 B |
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue