Various patches

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@6347 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,5 +1,17 @@
 2000-03-20  Adam Fedor  <fedor@gnu.org>
 
+	* gswapp.make: include common.make for TAR
+	* gswbundle.make: Likewise.
+
+	* GNUstep.sh.in: Replace pushd/popd with cd equivalent since not
+	all OS's have it.
+
+	* bundle.make: Include localization support (from gswbundle.make)
+	(Patch from Jonathan Gapen <jagapen@whitewater.chem.wisc.edu>)
+
+	* documentation.make: Take out sed of @email and @url since
+	texinfo has them now.
+
 	* configure.in (GRAPHIC_LIBS): Check for libXmu if libwraster
 	not found. Add X libs if libwraster not found.
 

GNUstep.sh.in

@@ -47,10 +47,11 @@ export GNUSTEP_MAKEFILES
 # Determine the host information
 #
 if [ -z "$GNUSTEP_HOST" ]; then
-  pushd /tmp >> /dev/null
+  # Not all OSs (e.g. FreeBSD < 4.0) have pushd/popd
+  tmpdir=`pwd`; cd /tmp
   GNUSTEP_HOST=`$GNUSTEP_MAKEFILES/config.guess`
   GNUSTEP_HOST=`$GNUSTEP_MAKEFILES/config.sub $GNUSTEP_HOST`
-  popd >> /dev/null
+  cd $tmpdir
 fi
 GNUSTEP_HOST_CPU=`$GNUSTEP_MAKEFILES/cpu.sh $GNUSTEP_HOST`
 GNUSTEP_HOST_VENDOR=`$GNUSTEP_MAKEFILES/vendor.sh $GNUSTEP_HOST`

bundle.make

@@ -31,6 +31,8 @@ include $(GNUSTEP_MAKEFILES)/rules.make
 
 # The name of the bundle is in the BUNDLE_NAME variable.
 # The list of bundle resource file are in xxx_RESOURCE_FILES
+# The list of localized bundle resource files is in xxx_LOCALIZED_RESOURCE_FILES
+# The list of languages the bundle supports is in xxx_LANGUAGES
 # The list of bundle resource directories are in xxx_RESOURCE_DIRS
 # The name of the principal class is xxx_PRINCIPAL_CLASS
 # where xxx is the bundle name
@@ -85,6 +87,12 @@ BUNDLE_RESOURCE_DIRS = $(foreach d, $(RESOURCE_DIRS), $(BUNDLE_DIR_NAME)/Resourc
 ifeq ($(strip $(RESOURCE_FILES)),)
   override RESOURCE_FILES=""
 endif
+ifeq ($(strip $(LOCALIZED_RESOURCE_FILES)),)
+  override LOCALIZED_RESOURCE_FILES=""
+endif
+ifeq ($(strip $(LANGUAGES)),)
+  override LANGUAGES="English"
+endif
 ifeq ($(BUNDLE_INSTALL_DIR),)
   BUNDLE_INSTALL_DIR := $(GNUSTEP_BUNDLES)
 endif
@@ -95,7 +103,7 @@ build-bundle-dir::
 		$(BUNDLE_DIR_NAME)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO) \
 		$(BUNDLE_RESOURCE_DIRS)
 
-build-bundle:: $(BUNDLE_FILE) bundle-resource-files
+build-bundle:: $(BUNDLE_FILE) bundle-resource-files localized-bundle-resource-files
 
 $(BUNDLE_FILE) : $(C_OBJ_FILES) $(OBJC_OBJ_FILES) $(SUBPROJECT_OBJ_FILES)
 	$(BUNDLE_LD) $(BUNDLE_LDFLAGS) $(ALL_LDFLAGS) \
@@ -111,6 +119,21 @@ bundle-resource-files:: $(BUNDLE_DIR_NAME)/Resources/Info-gnustep.plist
 	  done \
 	fi)
 
+localized-bundle-resource-files:: $(BUNDLE_DIR_NAME)/Resources/Info-gnustep.plist
+	@(if [ "$(LOCALIZED_RESOURCE_FILES)" != "" ]; then \
+	  echo "Copying localized resources into the bundle wrapper..."; \
+	  for l in $(LANGUAGES); do \
+	    if [ ! -f $$l.lproj ]; then \
+	      $(MKDIRS) $(BUNDLE_DIR_NAME)/Resources/$$l.lproj; \
+	    fi; \
+	    for f in $(LOCALIZED_RESOURCE_FILES); do \
+	      if [ -f $$l.lproj/$$f ]; then \
+	        cp -r $$l.lproj/$$f $(BUNDLE_DIR_NAME)/Resources/$$l.lproj; \
+	      fi; \
+	    done; \
+	  done; \
+	fi)
+
 ifeq ($(PRINCIPAL_CLASS),)
 override PRINCIPAL_CLASS = $(INTERNAL_bundle_NAME)
 endif

documentation.make

@@ -90,17 +90,14 @@ internal-textdoc-all:: before-all before-$(TARGET)-all \
 
 $(INTERNAL_doc_NAME).info: $(TEXI_FILES)
 	for i in $(TEXI_FILES); do \
-	   sed -e 's,@email{\([^}]*\)},<\1>,g' \
-		$$i \
-		| sed -e 's,@url{\([^}]*\)},@samp{\1},g' \
-		> `basename $$i .tmpl.texi`.texi ; \
+           cp $$i `basename $$i .tmpl.texi`.texi ; \
 	done
 	$(GNUSTEP_MAKEINFO) $(GNUSTEP_MAKEINFO_FLAGS) \
 		-o $@ $(INTERNAL_doc_NAME).texi
 
 $(INTERNAL_doc_NAME).dvi: $(TEXI_FILES)
 	for i in $(TEXI_FILES); do \
-		cp $$i `basename $$i .tmpl.texi`.texi ; \
+	  -cp $$i `basename $$i .tmpl.texi`.texi ; \
 	done
 	$(GNUSTEP_TEXI2DVI) $(GNUSTEP_TEXI2DVI_FLAGS) $(INTERNAL_doc_NAME).texi
 
@@ -121,10 +118,7 @@ $(INTERNAL_doc_NAME)_toc.html: $(TEXI_FILES)
 
 $(INTERNAL_textdoc_NAME): $(TEXI_FILES) $(TEXT_MAIN)
 	for i in $(TEXI_FILES) $(TEXT_MAIN); do \
-	   sed -e 's,@email{\([^}]*\)},<\1>,g' \
-		$$i \
-		| sed -e 's,@url{\([^}]*\)},@samp{\1},g' \
-		> `basename $$i .tmpl.texi`.texi ; \
+           -cp $$i `basename $$i .tmpl.texi`.texi ; \
 	done
 	$(GNUSTEP_MAKETEXT) $(GNUSTEP_MAKETEXT_FLAGS) \
 		-o $@ `basename $(TEXT_MAIN) .tmpl.texi`.texi

gswapp.make

@@ -30,10 +30,8 @@ GSWAPP_MAKE_LOADED=yes
 # Include in the common makefile rules
 #
 include $(GNUSTEP_MAKEFILES)/rules.make
+include $(GNUSTEP_MAKEFILES)/common.make
 
-#TODO: move this
-TAR=tar
-LN_S=ln -s
 GNUSTEP_GSWAPPS=$(GNUSTEP_INSTALLATION_DIR)/GSWApps
 
 #

gswbundle.make

@@ -29,10 +29,8 @@ GSWBUNDLE_MAKE_LOADED=yes
 # Include in the common makefile rules
 #
 include $(GNUSTEP_MAKEFILES)/rules.make
+include $(GNUSTEP_MAKEFILES)/common.make
 
-#TODO: move this
-TAR=tar
-LN_S=ln -s 
 GSWBUNDLE_LD= $(BUNDLE_LD)
 GSWBUNDLE_LDFLAGS = $(BUNDLE_LDFLAGS)