Skip to content

Commit 8ba7e38

Browse files
committed
New dist files with fixes related to parallax#122 and parallax#218
1 parent a516aac commit 8ba7e38

5 files changed

Lines changed: 2528 additions & 600 deletions

File tree

build.sh

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@
33
# Build script for jsPDF
44
# (c) 2014 Diego Casorran
55
#
6-
# NOTE: Still relying on wak's wscript.py
7-
# to generate dist/jspdf.source.js
8-
#
9-
# WARNING: I'm Ugly. Improve me, please.
10-
#
116

127
output=dist/jspdf.min.js
138
options="-m -c --wrap --stats"
@@ -19,8 +14,19 @@ build=`date +%Y-%m-%dT%H:%M`
1914
# Update submodules
2015
git submodule foreach git pull origin master
2116

17+
# Fix conflict with adler32
18+
adler1="libs/adler32cs.js/adler32cs.js"
19+
adler2="adler32-tmp.js"
20+
cat ${adler1} \
21+
| sed -e 's/this, function/jsPDF, function/' \
22+
| sed -e 's/typeof define/0/' > $adler2
23+
libs=${libs/$adler1/$adler2}
24+
2225
# Build dist files
23-
wak.py && uglifyjs ${options} -o ${output} ${libs} ${files}
26+
cat ${files} ${libs} \
27+
| sed s/\${buildDate}/${build}/ \
28+
| sed s/\${commitID}/${commit}/ >${output/min/source}
29+
uglifyjs ${options} -o ${output} ${files} ${libs}
2430

2531
# Pretend license information to minimized file
2632
for fn in ${files} ${libs}; do
@@ -43,3 +49,4 @@ done
4349
cat ${output} >> ${output}.tmp
4450
cat ${output}.tmp | sed '/^\s*$/d' | sed "s/\"1\.0\.0-trunk\"/\"1.0.0-trunk ${build}\"/" > ${output}
4551
rm -f ${output}.tmp ${output}.x
52+
rm $adler2

dist/jspdf.min.js

Lines changed: 27 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)