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

Fixed building frameworks with subprojects on Windows

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@21504 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2005-07-20 16:00:07 +00:00
parent 03b646e720
commit 771db1a6e5
4 changed files with 36 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
2005-07-20 Jeremy Bettis <jeremy@deadbeef.com>,
Nicola Pero <n.pero@mi.flashnet.it>
* config.make.in: Set FRAMEWORK_VERSION_SUPPORT here.
* Instance/framework.make: And do not set it here.
* Master/rules.make (%.variables, %.subprojects): if
FRAMEWORK_VERSION_SUPPORT is not set to yes, use
non-Versions directories for frameworks.
* config.make.in (HAS_LN_S): Make sure it's set to no
when it's not set to yes.
2005-07-14 Jeremy Bettis <jeremy@deadbeef.com>,
Nicola Pero <n.pero@mi.flashnet.it>

18
Instance/framework.make
View file

@ -91,11 +91,12 @@ ifeq ($(MAKE_CURRENT_VERSION),)
MAKE_CURRENT_VERSION = yes
endif
# If there are no working symlinks, unconditionally turn versioning
# off. This means that we create no symlinks inside the xxx.framework
# directory for the various versions; that everything is put top-level
# as in the case of bundles. So with FRAMEWORK_VERSION_SUPPORT = no,
# the Directory structure is:
# If there are no working symlinks, common.make sets
# FRAMEWORK_VERSION_SUPPORT to no, which unconditionally turn
# versioning off. This means that we create no symlinks inside the
# xxx.framework directory for the various versions; that everything is
# put top-level as in the case of bundles. So with
# FRAMEWORK_VERSION_SUPPORT = no, the Directory structure is:
#
# xxx.framework/libframework.dll.a
# xxx.framework/framework.dll
@ -106,11 +107,8 @@ endif
# the standard header/library locations so that they can be found by
# compiler/linker. Given that there are no symlinks, there is no other
# way of doing this.
ifeq ($(HAS_LN_S),no)
FRAMEWORK_VERSION_SUPPORT = no
ifeq ($(FRAMEWORK_VERSION_SUPPORT),no)
MAKE_CURRENT_VERSION = no
else
FRAMEWORK_VERSION_SUPPORT = yes
endif
# Set VERSION from xxx_VERSION
@ -318,8 +316,6 @@ internal-framework-all_:: $(GNUSTEP_OBJ_DIR) \
internal-framework-build-headers:: $(FRAMEWORK_HEADER_FILES) \
build-framework-dirs
ifeq ($(MAKE_CURRENT_VERSION),yes)
# A target to build/reset the Current symlink to point to the newly

20
Master/rules.make
View file

@ -295,9 +295,13 @@ if [ "$($(basename $(basename $*))_SUBPROJECTS)" != "" ]; then \
fi; \
if [ "$(OWNING_PROJECT_HEADER_DIR_NAME)" = "" ]; then \
if [ "$$type" = "framework" ]; then \
framework_version="$($(basename $(basename $*))_CURRENT_VERSION_NAME)"; \
if [ "$$framework_version" = "" ]; then framework_version="A"; fi; \
owning_project_header_dir="../$${instance}.framework/Versions/$${framework_version}/Headers"; \
if [ "$(FRAMEWORK_VERSION_SUPPORT)" = "yes" ]; then \
framework_version="$($(basename $(basename $*))_CURRENT_VERSION_NAME)"; \
if [ "$$framework_version" = "" ]; then framework_version="A"; fi; \
owning_project_header_dir="../$${instance}.framework/Versions/$${framework_version}/Headers"; \
else \
owning_project_header_dir="../$${instance}.framework/Headers"; \
fi; \
else owning_project_header_dir=""; \
fi; \
else \
@ -360,9 +364,13 @@ if [ "$($(basename $(basename $*))_SUBPROJECTS)" != "" ]; then \
fi; \
if [ "$(OWNING_PROJECT_HEADER_DIR_NAME)" = "" ]; then \
if [ "$$type" = "framework" ]; then \
framework_version="$($(basename $(basename $*))_CURRENT_VERSION_NAME)"; \
if [ "$$framework_version" = "" ]; then framework_version="A"; fi; \
owning_project_header_dir="../$${instance}.framework/Versions/$${framework_version}/Headers"; \
if [ "$(FRAMEWORK_VERSION_SUPPORT)" = "yes" ]; then \
framework_version="$($(basename $(basename $*))_CURRENT_VERSION_NAME)"; \
if [ "$$framework_version" = "" ]; then framework_version="A"; fi; \
owning_project_header_dir="../$${instance}.framework/Versions/$${framework_version}/Headers"; \
else \
owning_project_header_dir="../$${instance}.framework/Headers"; \
fi; \
else owning_project_header_dir=""; \
fi; \
else \

4
config.make.in
View file

@ -48,6 +48,8 @@ LN_S = @LN_S@
# returns LN_S
ifeq ($(LN_S), ln -s)
HAS_LN_S = yes
else
HAS_LN_S = no
endif
# Special case - on mingw32, autoconf sets LN_S to 'ln -s', but then
@ -66,8 +68,10 @@ endif
# platforms.
ifeq ($(HAS_LN_S), yes)
RM_LN_S = rm -f
FRAMEWORK_VERSION_SUPPORT = yes
else
RM_LN_S = rm -Rf
FRAMEWORK_VERSION_SUPPORT = no
endif
LD = $(CC)