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
2020cat bower \
2121 | sed " s/\" 1\.0\.0\" /\" ${version} \" /" > bower.json
2222
23- # Fix conflict with adler32
23+ # Fix conflict with adler32 & FileSaver
2424adler1=" libs/adler32cs.js/adler32cs.js"
2525adler2=" adler32-tmp.js"
2626cat ${adler1} \
2727 | sed -e ' s/this, function/jsPDF, function/' \
2828 | sed -e ' s/typeof define/0/' > $adler2
2929libs=${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 }
3035
3136# Build dist files
3237cat ${files} ${libs} \
@@ -55,7 +60,7 @@ for fn in ${files} ${libs}; do
5560done
5661cat ${output} >> ${output} .tmp
5762cat ${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
5964
6065
6166# Check options
You can’t perform that action at this time.
0 commit comments