File tree Expand file tree Collapse file tree 1 file changed +7
-2
lines changed Expand file tree Collapse file tree 1 file changed +7
-2
lines changed Original file line number Diff line number Diff line change @@ -20,13 +20,18 @@ git submodule foreach git pull origin master
20
20
cat bower \
21
21
| sed " s/\" 1\.0\.0\" /\" ${version} \" /" > bower.json
22
22
23
- # Fix conflict with adler32
23
+ # Fix conflict with adler32 & FileSaver
24
24
adler1=" libs/adler32cs.js/adler32cs.js"
25
25
adler2=" adler32-tmp.js"
26
26
cat ${adler1} \
27
27
| sed -e ' s/this, function/jsPDF, function/' \
28
28
| sed -e ' s/typeof define/0/' > $adler2
29
29
libs=${libs/ $adler1 / $adler2 }
30
+ saveas1=" libs/FileSaver.js/FileSaver.js"
31
+ saveas2=" FileSaver-tmp.js"
32
+ cat ${saveas1} \
33
+ | sed -e ' s/define !== null) && (define.amd != null/0/' > $saveas2
34
+ libs=${libs/ $saveas1 / $saveas2 }
30
35
31
36
# Build dist files
32
37
cat ${files} ${libs} \
@@ -55,7 +60,7 @@ for fn in ${files} ${libs}; do
55
60
done
56
61
cat ${output} >> ${output} .tmp
57
62
cat ${output} .tmp | sed ' /^\s*$/d' | sed " s/\" 1\.0\.0-trunk\" /\" ${version} -git ${build} :${whoami} \" /" > ${output}
58
- rm -f ${output} .tmp ${output} .x $adler2
63
+ rm -f ${output} .tmp ${output} .x $adler2 $saveas2
59
64
60
65
61
66
# Check options
You can’t perform that action at this time.
0 commit comments