[lmi-commits] [5449] Install 'jing' and 'trang'

[Greg Chicares]

Revision: 5449
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5449
Author:   chicares
Date:     2012-05-01 15:35:15 +0000 (Tue, 01 May 2012)
Log Message:
-----------
Install 'jing' and 'trang'

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/install_miscellanea.make

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2012-05-01 15:20:12 UTC (rev 5448)
+++ lmi/trunk/ChangeLog 2012-05-01 15:35:15 UTC (rev 5449)
@@ -29987,3 +29987,23 @@
   test_coding_rules.cpp
 Allow a file named 'md5sums'.
 
+20120501T1455Z <address@hidden> [573]
+
+  GNUmakefile
+Validate using 'md5sums' if it exists.
+
+20120501T1516Z <address@hidden> [573]
+
+  install_cygwin.bat
+Presumptively run 'rebaseall' for legacy version only.
+
+20120501T1520Z <address@hidden> [573]
+
+  install_cygwin.bat
+Install 'unzip' package.
+
+20120501T1535Z <address@hidden> [573]
+
+  install_miscellanea.make
+Install 'jing' and 'trang'.
+

Modified: lmi/trunk/install_miscellanea.make
===================================================================
--- lmi/trunk/install_miscellanea.make  2012-05-01 15:20:12 UTC (rev 5448)
+++ lmi/trunk/install_miscellanea.make  2012-05-01 15:35:15 UTC (rev 5449)
@@ -47,20 +47,25 @@
 boost_archive    := boost_1_33_1.tar.bz2
 cgicc_archive    := cgicc-3.1.4.tar.bz2
 fop_archive      := fop-0.20.5-bin.tar.gz
+jing_archive     := jing-20091111.zip
 md5sum_msw_exe   := md5sum.exe
 sample_archive   := lmi-data-20050618T1440Z.tar.bz2
+trang_archive    := trang-20091111.zip
 xmlwrapp_archive := xmlwrapp-0.6.0.tar.gz
 
 file_list := \
   $(boost_archive) \
   $(cgicc_archive) \
   $(fop_archive) \
+  $(jing_archive) \
   $(md5sum_msw_exe) \
   $(sample_archive) \
+  $(trang_archive) \
   $(xmlwrapp_archive) \
 
 boost cgicc xmlwrapp: stem =               $(basename $(basename 
$(address@hidden)))
 fop:                  stem = $(subst -bin,,$(basename $(basename 
$(address@hidden))))
+jing trang:           stem =                          $(basename 
$(address@hidden))
 md5sum_msw:           stem = $(md5sum_msw_exe)
 sample:               stem = data
 
@@ -69,15 +74,19 @@
 $(boost_archive)-url    := $(sf_mirror)/boost/$(boost_archive)
 $(cgicc_archive)-url    := ftp://ftp.gnu.org/pub/gnu/cgicc/$(cgicc_archive)
 $(fop_archive)-url      := 
http://archive.apache.org/dist/xmlgraphics/fop/binaries/$(fop_archive)
+$(jing_archive)-url     := 
http://jing-trang.googlecode.com/files/$(jing_archive)
 $(md5sum_msw_exe)-url   := 
http://etree.org/cgi-bin/counter.cgi/software/md5sum.exe#!md5!eb574b236133e60c989c6f472f07827b
 $(sample_archive)-url   := 
http://download.savannah.gnu.org/releases/lmi/$(sample_archive)
+$(trang_archive)-url    := 
http://jing-trang.googlecode.com/files/$(trang_archive)
 $(xmlwrapp_archive)-url := $(sf_mirror)/xmlwrapp/$(xmlwrapp_archive)
 
 $(boost_archive)-md5    := 2b999b2fb7798e1737d1fff8fac602ef
 $(cgicc_archive)-md5    := 6cb5153fc9fa64b4e50c7962aa557bbe
 $(fop_archive)-md5      := d6b43e3eddf9378536ad8127bc057d41
+$(jing_archive)-md5     := 13eef193921409a1636377d1efbf9843
 $(md5sum_msw_exe)-md5   := eb574b236133e60c989c6f472f07827b
 $(sample_archive)-md5   := e7f07133abfc3b9c2252dfa3b61191bc
+$(trang_archive)-md5    := 9d31799b948c350850eb9dd14e5b832d
 $(xmlwrapp_archive)-md5 := 331369a1b0e0539b1ce95a67e4c2bec4
 
 # Utilities 
####################################################################
@@ -95,6 +104,7 @@
 SORT   := sort
 TAR    := tar
 TOUCH  := touch
+UNZIP  := unzip
 WGET   := wget
 
 # Error messages 
###############################################################
@@ -116,7 +126,7 @@
 # Targets 
######################################################################
 
 .PHONY: all
-all: boost cgicc fop md5sum_msw sample xmlwrapp
+all: boost cgicc fop jing md5sum_msw sample trang xmlwrapp
 
 # Patches were generated according to this advice:
 #
@@ -173,6 +183,12 @@
        @$(MKDIR) $(destination)/$(stem)
        $(MV) scratch/$(stem)/* $(destination)/$(stem)
 
+.PHONY: jing
+jing: $(file_list)
+       @$(MKDIR) --parents $(destination)/rng
+       $(MV) scratch/$(stem)/bin/address@hidden         $(destination)/rng
+       $(MV) scratch/$(stem)/bin/xercesImpl.jar $(destination)/rng
+
 # The 'md5sum_msw' binary is required only by the msw-specific
 # 'fardel' target. On other platforms, it can't be executed, but it
 # could be used to create a cross 'fardel'.
@@ -197,6 +213,11 @@
        @-$(MKDIR) --parents $(prefix)/data
        $(MV) scratch/$(stem)/* $(prefix)/data
 
+.PHONY: trang
+trang: $(file_list)
+       @$(MKDIR) --parents $(destination)/rng
+       $(MV) scratch/$(stem)/address@hidden $(destination)/rng
+
 .PHONY: xmlwrapp
 xmlwrapp: $(file_list)
        -[ -e $(stem).patch ] && $(PATCH) --directory=scratch --strip=1 < 
$(stem).patch
@@ -253,6 +274,12 @@
        $(ECHO) "$(address@hidden) *$(cache_dir)/$@" | $(MD5SUM) --check
        $(CHMOD) 750 $(cache_dir)/$@
 
+.PHONY: %.zip
+%.zip:
+       cd $(cache_dir) && [ -e $@ ] || $(WGET) $(WGETFLAGS) $(address@hidden)
+       $(ECHO) "$(address@hidden) *$(cache_dir)/$@" | $(MD5SUM) --check
+       -$(UNZIP) $(cache_dir)/$@ -d scratch
+
 # Maintenance 
##################################################################
 
 # To test, make the 'clobber' and 'all' targets in that order.