[js-embedded-discovery COMMIT] in /trunk: Makefile build/build.sh

[noreply at shibboleth.net]

Author: scantor
Date: Wed Apr 29 11:54:13 2015
New Revision: 145

URL: http://svn.shibboleth.net/view/js-embedded-discovery?rev=145&view=rev
Log:
Fix backslash issues in build files

Modified:
    trunk/Makefile
    trunk/build/build.sh

Modified: trunk/Makefile
URL: http://svn.shibboleth.net/view/js-embedded-discovery/trunk/Makefile?rev=145&r1=144&r2=145&view=diff
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Wed Apr 29 11:54:13 2015
@@ -16,10 +16,10 @@
 
 kit:	clean
 	mkdir ${TARGET}
-	mkdir ${TARGET}\nonminimised
-	cat src\javascript\idpselect_languages.js src/javascript/typeahead.js src/javascript/idpselect.js | ${JAVA} -jar build/yuicompressor-2.4.8.jar -o ${TARGET}/idpselect.js --type js
+	mkdir ${TARGET}/nonminimised
+	cat src/javascript/idpselect_languages.js src/javascript/typeahead.js src/javascript/idpselect.js | ${JAVA} -jar build/yuicompressor-2.4.8.jar -o ${TARGET}/idpselect.js --type js
 	cp Makefile shibboleth-embedded-ds.spec LICENSE.txt doc/*.txt src/resources/index.html src/resources/idpselect.css src/javascript/idpselect_config.js src/apache/*.conf ${TARGET}
-	cp src\javascript\*.js ${TARGET}\nonminimised
+	cp src/javascript/*.js ${TARGET}/nonminimised
 
 dist:	kit
 	${TAR} czf ${TARGET}.tar.gz ${TARGET}/*; rm -rf ${TARGET}

Modified: trunk/build/build.sh
URL: http://svn.shibboleth.net/view/js-embedded-discovery/trunk/build/build.sh?rev=145&r1=144&r2=145&view=diff
==============================================================================
--- trunk/build/build.sh	(original)
+++ trunk/build/build.sh	Wed Apr 29 11:54:13 2015
@@ -39,7 +39,7 @@
 
 # Build js
 
-cat ..\src\javascript\idpselect_languages.js ../src/javascript/typeahead.js ../src/javascript/idpselect.js | java -jar yuicompressor-2.4.8.jar -o ../target/idpselect.js --type js
+cat ../src/javascript/idpselect_languages.js ../src/javascript/typeahead.js ../src/javascript/idpselect.js | java -jar yuicompressor-2.4.8.jar -o ../target/idpselect.js --type js
 
 # Build CSS
 java -jar yuicompressor-2.4.8.jar -o ../target/idpselect.js --type css ../src/resources/idpselect.css