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

Fixes and improvements to 'make strings'; small cleanup of some other instance makefiles

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@31192 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2010-08-21 09:20:40 +00:00
parent 82b39718b8
commit 988f5f3836
8 changed files with 57 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
ChangeLog
View file

@ -1,3 +1,24 @@
2010-08-21 Nicola Pero <nicola.pero@meta-innovation.com>
* Instance/Shared/strings.make: Renamed most local variables to
standardized names. Automatically create required, but
non-existing, {LANGUAGE}.lproj directories before running
make_strings. If no languages are specified, use English instead
of printing an error messages.
* Instance/rules.make (LANGUAGES): Set this variable here, once
for all makefile fragments, instead of having each fragment
contain the same duplicated code to set it.
* Instance/gswbundle.make (LANGUAGES): Do not set it.
* Instance/resource-set.make (LANGUAGES): Do not set it.
* Instance/Shared/bundle.make (LANGUAGES): Do not set it.
* Instance/Shared/strings.make (LANGUAGES): Do not set it.
* Instance/Shared/headers.make: Added -*-makefile-*- line at the
beginning of the file (for emacs).
* Instance/Shared/java.make: Same change.
* Instance/Shared/strings.make: Same change.
2010-08-14 Nicola Pero <nicola.pero@meta-innovation.com>
* target.make (OBJ_MERGE_CMD): Use -Wl,-r instead of -r. -Wl,-r

7
Instance/Shared/bundle.make
View file

@ -80,7 +80,7 @@
# to create.
#
# $(GNUSTEP_INSTANCE)_LANGUAGES : the list of languages of localized resource
# files
# files (processed in rules.make, and converted into a LANGUAGES list)
#
# $(GNUSTEP_INSTANCE)_LOCALIZED_RESOURCE_FILES : a list of localized
# resource files to install.
@ -149,7 +149,6 @@
RESOURCE_FILES = $(strip $($(GNUSTEP_INSTANCE)_RESOURCE_FILES) \
$($(GNUSTEP_INSTANCE)_COMPONENTS))
RESOURCE_DIRS = $(strip $($(GNUSTEP_INSTANCE)_RESOURCE_DIRS))
LANGUAGES = $(strip $($(GNUSTEP_INSTANCE)_LANGUAGES))
LOCALIZED_RESOURCE_FILES = \
$(strip $($(GNUSTEP_INSTANCE)_LOCALIZED_RESOURCE_FILES) \
$($(GNUSTEP_INSTANCE)_LOCALIZED_COMPONENTS))
@ -175,10 +174,6 @@ $(foreach d, $(RESOURCE_DIRS), $(GNUSTEP_SHARED_BUNDLE_RESOURCE_PATH)/$(d))
endif
ifeq ($(LANGUAGES),)
LANGUAGES = English
endif
$(GNUSTEP_SHARED_BUNDLE_RESOURCE_PATH):
$(ECHO_CREATING)$(MKDIRS) $@$(END_ECHO)

2
Instance/Shared/headers.make
View file

@ -1,4 +1,4 @@
#
# -*-makefile-*-
# Shared/headers.make
#
# Makefile fragment with rules to install header files

2
Instance/Shared/java.make
View file

@ -1,4 +1,4 @@
#
# -*-makefile-*-
# Shared/java.make
#
# Makefile fragment with rules to compile and install java files,

48
Instance/Shared/strings.make
View file

@ -1,11 +1,11 @@
#
# -*-makefile-*-
# Shared/strings.make
#
# Makefile fragment with rules to run make_strings
#
# Copyright (C) 2002 Free Software Foundation, Inc.
# Copyright (C) 2002, 2010 Free Software Foundation, Inc.
#
# Author: Nicola Pero <nicola@brainstorm.co.uk>
# Author: Nicola Pero <nicola.pero@meta-innovation.com>
#
# This file is part of the GNUstep Makefile Package.
#
@ -22,7 +22,8 @@
#
# input variables:
#
# $(GNUSTEP_INSTANCE)_LANGUAGES: the list of languages
# $(GNUSTEP_INSTANCE)_LANGUAGES: the list of languages (processed in rules.make,
# and converted into LANGUAGES)
#
# $(GNUSTEP_INSTANCE)_STRINGS_FILES: the list of ObjC/C/.h files to
# parse; if not set, it defaults to $(GNUSTEP_INSTANCE)_OBJC_FILES and
@ -39,41 +40,38 @@
#
ifneq ($(strip $($(GNUSTEP_INSTANCE)_STRINGS_FILES)),)
Str_STRINGS_FILES = $($(GNUSTEP_INSTANCE)_STRINGS_FILES)
GNUSTEP_STRINGS_FILES = $(strip $($(GNUSTEP_INSTANCE)_STRINGS_FILES))
else
Str1_STRINGS_FILES = \
GNUSTEP_STRINGS_FILES = $(strip \
$($(GNUSTEP_INSTANCE)_OBJC_FILES) \
$($(GNUSTEP_INSTANCE)_C_FILES) \
$(addprefix $($(GNUSTEP_INSTANCE)_HEADER_FILES_DIR),$($(GNUSTEP_INSTANCE)_HEADER_FILES))
Str_STRINGS_FILES = $(strip $(Str1_STRINGS_FILES))
$(addprefix $($(GNUSTEP_INSTANCE)_HEADER_FILES_DIR),$($(GNUSTEP_INSTANCE)_HEADER_FILES)))
endif
.PHONY: internal-$(GNUSTEP_TYPE)-strings
ifeq ($(Str_STRINGS_FILES),)
ifeq ($(GNUSTEP_STRINGS_FILES),)
internal-$(GNUSTEP_TYPE)-strings::
$(ALWAYS_ECHO_NO_FILES)
else # we have some STRINGS_FILES
else # we have some GNUSTEP_STRINGS_FILES
Str_LANGUAGES = $(strip $($(GNUSTEP_INSTANCE)_LANGUAGES))
Str_MAKE_STRINGS_OPTIONS = $(strip $($(GNUSTEP_INSTANCE)_MAKE_STRINGS_OPTIONS))
ifeq ($(Str_MAKE_STRINGS_OPTIONS),)
Str_MAKE_STRINGS_OPTIONS = $(MAKE_STRINGS_OPTIONS)
GNUSTEP_MAKE_STRINGS_OPTIONS = $(strip $($(GNUSTEP_INSTANCE)_MAKE_STRINGS_OPTIONS))
ifeq ($(GNUSTEP_MAKE_STRINGS_OPTIONS),)
GNUSTEP_MAKE_STRINGS_OPTIONS = $(MAKE_STRINGS_OPTIONS)
endif
internal-$(GNUSTEP_TYPE)-strings::
ifeq ($(Str_LANGUAGES),)
$(ALWAYS_ECHO_NO_LANGUAGES)
else
$(ECHO_MAKING_STRINGS)make_strings $(Str_MAKE_STRINGS_OPTIONS) \
-L "$(Str_LANGUAGES)" \
$(Str_STRINGS_FILES)$(END_ECHO)
endif
GNUSTEP_LANGUAGE_DIRS = $(foreach l, $(LANGUAGES), $(l).lproj)
endif # Str_STRING_FILES = ''
$(GNUSTEP_LANGUAGE_DIRS):
$(ECHO_CREATING)$(MKDIRS) $@$(END_ECHO)
internal-$(GNUSTEP_TYPE)-strings:: $(GNUSTEP_LANGUAGE_DIRS)
$(ECHO_MAKING_STRINGS)make_strings $(GNUSTEP_MAKE_STRINGS_OPTIONS) \
-L "$(LANGUAGES)" \
$(GNUSTEP_STRINGS_FILES)$(END_ECHO)
endif # GNUSTEP_STRING_FILES = ''

6
Instance/gswbundle.make
View file

@ -35,7 +35,6 @@ endif
# TODO: We should remove this makefile since it's not really supported.
COMPONENTS = $($(GNUSTEP_INSTANCE)_COMPONENTS)
LANGUAGES = $($(GNUSTEP_INSTANCE)_LANGUAGES)
WEBSERVER_RESOURCE_FILES = $($(GNUSTEP_INSTANCE)_WEBSERVER_RESOURCE_FILES)
LOCALIZED_WEBSERVER_RESOURCE_FILES = $($(GNUSTEP_INSTANCE)_LOCALIZED_WEBSERVER_RESOURCE_FILES)
WEBSERVER_RESOURCE_DIRS = $($(GNUSTEP_INSTANCE)_WEBSERVER_RESOURCE_DIRS)
@ -104,11 +103,6 @@ GSWBUNDLE_FILE = $(GNUSTEP_BUILD_DIR)/$(GSWBUNDLE_FILE_NAME)
GSWBUNDLE_RESOURCE_DIRS = $(foreach d, $(RESOURCE_DIRS), $(GSWBUNDLE_DIR)/Resources/$(d))
GSWBUNDLE_WEBSERVER_RESOURCE_DIRS = $(foreach d, $(WEBSERVER_RESOURCE_DIRS), $(GSWBUNDLE_DIR)/Resources/WebServer/$(d))
ifeq ($(strip $(LANGUAGES)),)
LANGUAGES="English"
endif
build-bundle-dir: $(GSWBUNDLE_DIR)/Resources \
$(GSWBUNDLE_DIR)/$(GNUSTEP_TARGET_LDIR) \
$(GSWBUNDLE_RESOURCE_DIRS)

6
Instance/resource-set.make
View file

@ -102,12 +102,6 @@ ifneq ($(CHOWN_TO),)
$(ECHO_CHOWNING)$(CHOWN) -R $(CHOWN_TO) $@$(END_ECHO)
endif
# Determine the list of languages
override LANGUAGES = $($(GNUSTEP_INSTANCE)_LANGUAGES)
ifeq ($(LANGUAGES),)
override LANGUAGES = English
endif
# Determine the list of localized resource files
LOCALIZED_RESOURCE_FILES = $($(GNUSTEP_INSTANCE)_LOCALIZED_RESOURCE_FILES)
LOCALIZED_RESOURCE_DIRS = $($(GNUSTEP_INSTANCE)_LOCALIZED_RESOURCE_DIRS)

10
Instance/rules.make
View file

@ -477,3 +477,13 @@ ALL_LIBS = \
$(SYSTEM_LIBS) $(TARGET_SYSTEM_LIBS)
endif
#
# Determine the languages used by this instance. This is used in
# various places (bundles, resource sets, make_strings) where language
# resources are managed.
#
LANGUAGES = $(strip $($(GNUSTEP_INSTANCE)_LANGUAGES))
ifeq ($(LANGUAGES),)
LANGUAGES = English
endif