From c9c86c17f896d4ae923b0be31c6582b0350ba06a Mon Sep 17 00:00:00 2001 From: Nicola Pero Date: Fri, 14 Dec 2001 14:51:27 +0000 Subject: [PATCH] Implemented strip=yes git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@11751 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 20 ++++++++++++++++++++ application.make | 3 +++ bundle.make | 3 +++ config.make.in | 1 + framework.make | 6 ++++++ gswapp.make | 3 +++ gswbundle.make | 3 +++ palette.make | 6 ++++++ rules.make | 8 ++++++++ service.make | 3 +++ 10 files changed, 56 insertions(+) diff --git a/ChangeLog b/ChangeLog index 2cf8cdb31..e183ffc8c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +Fri Dec 14 12:32:45 2001 Nicola Pero + + * palette.make (internal-palette-install): If CHOWN_TO is + defined, chown the installed dir. + +Fri Dec 14 12:22:44 2001 Nicola Pero + + Implemented strip=yes. + * config.make.in (STRIP): New variable. + * rules.make (INSTALL_PROGRAM): Add -s if strip=yes. + (strip): Export if defined to be yes. + * application.make (internal-app-install): Strip the installed + executable if strip=yes. + * bundle.make (internal-bundle-install): Idem. + * framework.make (internal-framework-install): Idem. + * gswapp.make (internal-gswapp-install): Idem. + * gswbundle.make (internal-bundle-install): Idem. + * palette.make (internal-palette-install): Idem. + * service.make (internal-service-install): Idem. + Thu Dec 13 12:27:18 2001 Nicola Pero * java-tool.make diff --git a/application.make b/application.make index 0a3ea002a..ae3e727aa 100644 --- a/application.make +++ b/application.make @@ -261,6 +261,9 @@ internal-app-install:: $(GNUSTEP_APPS) ifneq ($(CHOWN_TO),) $(CHOWN) -R $(CHOWN_TO) $(GNUSTEP_APPS)/$(APP_DIR_NAME) endif +ifeq ($(strip),yes) + $(STRIP) $(GNUSTEP_APPS)/$(APP_FILE) +endif $(GNUSTEP_APPS): diff --git a/bundle.make b/bundle.make index 76d86ec86..c9e8ae30c 100644 --- a/bundle.make +++ b/bundle.make @@ -307,6 +307,9 @@ endif ifneq ($(CHOWN_TO),) $(CHOWN) -R $(CHOWN_TO) $(BUNDLE_INSTALL_DIR)/$(BUNDLE_DIR_NAME) endif +ifeq ($(strip),yes) + $(STRIP) $(BUNDLE_INSTALL_DIR)/$(BUNDLE_FILE) +endif $(BUNDLE_DIR_NAME)/Resources: $(MKDIRS) $@ diff --git a/config.make.in b/config.make.in index 3e276efb2..7c1e932ce 100644 --- a/config.make.in +++ b/config.make.in @@ -64,6 +64,7 @@ INSTALL_DATA = @INSTALL_DATA@ TAR = @TAR@ MKDIRS = $(GNUSTEP_MAKEFILES)/mkinstalldirs CHOWN = chown +STRIP = strip # The default library combination default_library_combo = @ac_cv_library_combo@ diff --git a/framework.make b/framework.make index 662ce97d9..f8d226b06 100644 --- a/framework.make +++ b/framework.make @@ -447,6 +447,9 @@ internal-framework-install:: $(FRAMEWORK_INSTALL_DIR) \ $(TAR) cf - $(FRAMEWORK_DIR_NAME) | (cd $(FRAMEWORK_INSTALL_DIR); $(TAR) xf -) ifneq ($(CHOWN_TO),) $(CHOWN) -R $(CHOWN_TO) $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_DIR_NAME) +endif +ifeq ($(strip),yes) + $(STRIP) $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_FILE) endif @(cd $(GNUSTEP_FRAMEWORKS_HEADERS); \ if [ "$(HEADER_FILES)" != "" ]; then \ @@ -495,6 +498,9 @@ internal-framework-install:: $(FRAMEWORK_INSTALL_DIR) \ $(TAR) cf - $(FRAMEWORK_DIR_NAME) | (cd $(FRAMEWORK_INSTALL_DIR); $(TAR) xf -) ifneq ($(CHOWN_TO),) $(CHOWN) -R $(CHOWN_TO) $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_DIR_NAME) +endif +ifeq ($(strip),yes) + $(STRIP) $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_FILE) endif (cd $(GNUSTEP_FRAMEWORKS_HEADERS); \ if [ "$(HEADER_FILES)" != "" ]; then \ diff --git a/gswapp.make b/gswapp.make index e915263cd..89a99e56e 100644 --- a/gswapp.make +++ b/gswapp.make @@ -364,6 +364,9 @@ internal-gswapp-install:: ifneq ($(CHOWN_TO),) $(CHOWN) -R $(CHOWN_TO) $(GNUSTEP_GSWAPPS)/$(GSWAPP_DIR_NAME) endif +ifeq ($(strip),yes) + $(STRIP) $(GNUSTEP_GSWAPPS)/$(GSWAPP_FILE) +endif internal-gswapp-uninstall:: (cd $(GNUSTEP_GSWAPPS); rm -rf $(GSWAPP_DIR_NAME)) diff --git a/gswbundle.make b/gswbundle.make index e163b48c9..8d364417b 100644 --- a/gswbundle.make +++ b/gswbundle.make @@ -290,6 +290,9 @@ endif ifneq ($(CHOWN_TO),) $(CHOWN) -R $(CHOWN_TO) $(GSWBUNDLE_INSTALL_DIR)/$(GSWBUNDLE_DIR_NAME) endif +ifeq ($(strip),yes) + $(STRIP) $(GSWBUNDLE_INSTALL_DIR)/$(GSWBUNDLE_FILE) +endif $(GSWBUNDLE_INSTALL_DIR):: @$(MKINSTALLDIRS) $@ diff --git a/palette.make b/palette.make index 574843cef..0acb1bf38 100644 --- a/palette.make +++ b/palette.make @@ -170,6 +170,12 @@ $(PALETTE_DIR_NAME)/Resources/palette.table: $(PALETTE_DIR_NAME)/Resources internal-palette-install:: internal-install-dirs tar cf - $(PALETTE_DIR_NAME) | (cd $(PALETTE_INSTALL_DIR); tar xf -) +ifneq ($(CHOWN_TO),) + $(CHOWN) -R $(CHOWN_TO) $(PALETTE_INSTALL_DIR)/$(PALETTE_DIR_NAME) +endif +ifeq ($(strip),yes) + $(STRIP) $(PALETTE_INSTALL_DIR)/$(PALETTE_FILE) +endif internal-install-dirs:: $(PALETTE_INSTALL_DIR) diff --git a/rules.make b/rules.make index d3f2153dd..9b25491d4 100644 --- a/rules.make +++ b/rules.make @@ -185,6 +185,14 @@ $(GNUSTEP_MAKEFILES)/$(GNUSTEP_TARGET_DIR)/config.make: ; $(GNUSTEP_MAKEFILES)/Additional/*.make: ; +# +# Manage stripping +# +ifeq ($(strip),yes) +INSTALL_PROGRAM += -s +export strip +endif + # # Prepare the arguments to install to set user/group of installed files # diff --git a/service.make b/service.make index 93a29a2d3..ab84c206a 100644 --- a/service.make +++ b/service.make @@ -182,6 +182,9 @@ internal-service-install:: $(GNUSTEP_SERVICES) ifneq ($(CHOWN_TO),) $(CHOWN) -R $(CHOWN_TO) $(GNUSTEP_SERVICES)/$(SERVICE_DIR_NAME) endif +ifeq ($(strip),yes) + $(STRIP) $(GNUSTEP_SERVICES)/$(SERVICE_FILE) +endif internal-service-uninstall:: (cd $(GNUSTEP_SERVICES); rm -rf $(SERVICE_DIR_NAME))