Permalink
Browse files

Merge remote-tracking branch 'cavalier/SOURCE1'

  • Loading branch information...
2 parents 7b8a4d8 + cf3695d commit 847631c35a032672572030fe1a766d1dc3abad4e @v4hn v4hn committed Sep 26, 2013
@@ -4,7 +4,7 @@
MODULE=docbook-sgml
MOD=docbook
VERSION=4.5
- SOURCE1=docbk31.zip
+ SOURCE=docbk31.zip
SOURCE2=docbk41.zip
SOURCE3=$MOD-4.2.zip
SOURCE4=$MOD-4.3.zip
@@ -18,9 +18,9 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/sgml
SOURCE3_URL[1]=http://www.docbook.org/sgml/4.2
SOURCE2_URL[0]=http://www.oasis-open.org/docbook/sgml/4.1
SOURCE2_URL[1]=http://www.docbook.org/sgml/4.1
- SOURCE1_URL[0]=http://www.oasis-open.org/docbook/sgml/3.1
- SOURCE1_URL[1]=http://www.docbook.org/sgml/3.1
- SOURCE1_VFY=sha1:75a5bb4f17b17ff0f7dd1cc2db7112bad0fb89e6
+ SOURCE_URL[0]=http://www.oasis-open.org/docbook/sgml/3.1
+ SOURCE_URL[1]=http://www.docbook.org/sgml/3.1
+ SOURCE_VFY=sha1:75a5bb4f17b17ff0f7dd1cc2db7112bad0fb89e6
SOURCE2_VFY=sha1:3009fcc364511d186da40e828bf0d5d1556c020e
SOURCE3_VFY=sha1:98afcae616ed24edb30e40baa4ddd8cd8731f2c7
SOURCE4_VFY=sha1:c64759d07514a7ab4347b1fc03457664cdf98b3f
@@ -2,7 +2,7 @@ mk_source_dir $SOURCE_DIRECTORY &&
cd $SOURCE_DIRECTORY &&
for dir in '3.1 4.1 4.2 4.3 4.5'
do mkdir $dir; done &&
-unzip $SOURCE_CACHE/$SOURCE1 -d $SOURCE_DIRECTORY/3.1 &&
+unzip $SOURCE_CACHE/$SOURCE -d $SOURCE_DIRECTORY/3.1 &&
unzip $SOURCE_CACHE/$SOURCE2 -d $SOURCE_DIRECTORY/4.1 &&
unzip $SOURCE_CACHE/$SOURCE3 -d $SOURCE_DIRECTORY/4.2 &&
unzip $SOURCE_CACHE/$SOURCE4 -d $SOURCE_DIRECTORY/4.3 &&
@@ -1,14 +1,14 @@
MODULE=docbook-xml
VERSION=4.5
- SOURCE1=$MODULE-4.3.zip
+ SOURCE=$MODULE-4.3.zip
SOURCE2=buildDocBookCatalog
SOURCE3=$MODULE-4.5.zip
SOURCE4=docbkx412.zip
SOURCE5=$MODULE-4.2.zip
SOURCE6=$MODULE-4.4.zip
SOURCE_DIRECTORY=$BUILD_DIRECTORY/xml
- SOURCE1_URL[0]=http://www.oasis-open.org/docbook/xml/4.3
- SOURCE1_URL[1]=http://www.docbook.org/xml/4.3
+ SOURCE_URL[0]=http://www.oasis-open.org/docbook/xml/4.3
+ SOURCE_URL[1]=http://www.docbook.org/xml/4.3
SOURCE2_URL[0]=http://xmlsoft.org
SOURCE3_URL[0]=http://www.oasis-open.org/docbook/xml/4.5
SOURCE3_URL[1]=http://www.docbook.org/xml/4.5
@@ -18,7 +18,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/xml
SOURCE5_URL[1]=http://www.docbook.org/xml/4.2
SOURCE6_URL[0]=http://www.oasis-open.org/docbook/xml/4.4
SOURCE6_URL[1]=http://www.docbook.org/xml/4.4
- SOURCE1_VFY=sha1:e79a59e9164c1013b8cc9f64f96f909a184ca016
+ SOURCE_VFY=sha1:e79a59e9164c1013b8cc9f64f96f909a184ca016
SOURCE2_VFY=sha1:9890a7505713a5c78b038f7e5a2b9e06d6f96f1d
SOURCE3_VFY=sha1:b9124233b50668fb508773aa2b3ebc631d7c1620
SOURCE4_VFY=sha1:b9ae7a41056bfaf885581812d60651b7b5531519
@@ -4,7 +4,7 @@ for dir in '4.1.2 4.2 4.3 4.4 4.5'
do mkdir $dir; done &&
unzip $SOURCE_CACHE/$SOURCE4 -d $SOURCE_DIRECTORY/4.1.2 &&
unzip $SOURCE_CACHE/$SOURCE5 -d $SOURCE_DIRECTORY/4.2 &&
-unzip $SOURCE_CACHE/$SOURCE1 -d $SOURCE_DIRECTORY/4.3 &&
+unzip $SOURCE_CACHE/$SOURCE -d $SOURCE_DIRECTORY/4.3 &&
unzip $SOURCE_CACHE/$SOURCE6 -d $SOURCE_DIRECTORY/4.4 &&
unzip $SOURCE_CACHE/$SOURCE3 -d $SOURCE_DIRECTORY/4.5 &&
#Remove old directory structure

0 comments on commit 847631c

Please sign in to comment.