gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-04-23 22:33:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Enhanced frameworkPath and frameworkEnv methods of dummy framework class to work in new filesystem stuff and be potentially useful in the future

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@24539 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2007-02-14 04:17:27 +00:00
parent e0a6d8aa55
commit aea79b01c8
2 changed files with 10 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2007-02-14 Nicola Pero <nicola.pero@meta-innovation.com>
* Instance/framework.make ($(DUMMY_FRAMEWORK_FILE)): Return the
real complete installation path into +frameworkPath; return nil
into +frameworkEnv. These methods are currently unused, but
future versions of gnustep-base might read +frameworkPath to have
a better chance of finding the framework on disk.
2007-02-14 Nicola Pero <nicola.pero@meta-innovation.com>
* target.make (TARGET_LIB_DIR): (MacOS-Server 1.0, OpenStep 4.x):

21
Instance/framework.make
View file

@ -418,23 +418,6 @@ $(DUMMY_FRAMEWORK_FILE): $(DERIVED_SOURCES_DIR)/.stamp $(OBJ_FILES_TO_LINK) GNUm
classarray="$$classarray)"; \
fi; \
echo "$$classarray" > $(DUMMY_FRAMEWORK_CLASS_LIST); \
if [ "$(findstring $(GNUSTEP_SYSTEM_ROOT), $(FRAMEWORK_INSTALL_DIR))" = $(GNUSTEP_SYSTEM_ROOT) ]; then \
fw_env="@\"GNUSTEP_SYSTEM_ROOT\""; \
elif [ "$(findstring $(GNUSTEP_LOCAL_ROOT), $(FRAMEWORK_INSTALL_DIR))" = $(GNUSTEP_LOCAL_ROOT) ]; then \
fw_env="@\"GNUSTEP_LOCAL_ROOT\""; \
elif [ "$(findstring $(GNUSTEP_USER_ROOT), $(FRAMEWORK_INSTALL_DIR))" = $(GNUSTEP_USER_ROOT) ]; then \
fw_env="@\"GNUSTEP_USER_ROOT\""; \
else \
fw_env="nil"; \
fi; \
fw_path=`echo $(FRAMEWORK_INSTALL_DIR) | sed 's/^$(subst /,\/,$(GNUSTEP_FRAMEWORKS))//'`; \
if [ "$$fw_path" = "$(FRAMEWORK_INSTALL_DIR)" ]; then \
fw_path="nil"; \
elif [ "$$fw_path" = "" ]; then \
fw_path="nil"; \
else \
fw_path="@\"$$fw_path\""; \
fi; \
echo "#include <Foundation/NSString.h>" > $@; \
echo "@interface $(DUMMY_FRAMEWORK)" >> $@; \
echo "+ (NSString *)frameworkEnv;" >> $@; \
@ -443,8 +426,8 @@ $(DUMMY_FRAMEWORK_FILE): $(DERIVED_SOURCES_DIR)/.stamp $(OBJ_FILES_TO_LINK) GNUm
echo "+ (NSString **)frameworkClasses;" >> $@; \
echo "@end" >> $@; \
echo "@implementation $(DUMMY_FRAMEWORK)" >> $@; \
echo "+ (NSString *)frameworkEnv { return $$fw_env; }" >> $@; \
echo "+ (NSString *)frameworkPath { return $$fw_path; }" >> $@; \
echo "+ (NSString *)frameworkEnv { return nil; }" >> $@; \
echo "+ (NSString *)frameworkPath { return @\"$(FRAMEWORK_INSTALL_DIR)\"; }" >> $@; \
echo "+ (NSString *)frameworkVersion { return @\"$(CURRENT_VERSION_NAME)\"; }" >> $@; \
echo "static NSString *allClasses[] = {$$classlist};" >> $@; \
echo "+ (NSString **)frameworkClasses { return allClasses; }" >> $@;\