diff --git a/Makefile b/Makefile index 51efc8f8..35cd823a 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,6 @@ RUN_JS = @@java -XX:ReservedCodeCacheSize=64m -classpath build/js.jar:build/goog - # Build Targets # When no build target is specified, all gets ran @@ -101,7 +100,7 @@ js: init external/r.js/dist/r.js \ -o baseUrl="js" \ include=jquery.mobile \ - exclude=jquery,order,text,text!../version.txt \ + exclude=jquery,../external/requirejs/order,../external/requirejs/text,../external/requirejs/text!../version.txt \ out=${OUTPUT}/${NAME}.compiled.js \ pragmasOnSave.jqmBuildExclude=true \ wrap.startFile=build/wrap.start \ diff --git a/build/docs.build.js b/build/docs.build.js index 23f2f564..5ff8d862 100644 --- a/build/docs.build.js +++ b/build/docs.build.js @@ -20,7 +20,7 @@ modules: [ { name: "jquery.mobile.docs", - exclude: [ "jquery", "order" , "text", "text!../version.txt" ] + exclude: [ "jquery", "../external/requirejs/order" , "../external/requirejs/text", "../external/requirejs/text!../version.txt" ] } ], diff --git a/js/order.js b/external/requirejs/order.js similarity index 100% rename from js/order.js rename to external/requirejs/order.js diff --git a/js/text.js b/external/requirejs/text.js similarity index 100% rename from js/text.js rename to external/requirejs/text.js diff --git a/js/jquery.mobile.core.js b/js/jquery.mobile.core.js index db61d189..ae253537 100644 --- a/js/jquery.mobile.core.js +++ b/js/jquery.mobile.core.js @@ -4,7 +4,7 @@ //>>group: core //>>required: true -define( [ "jquery", "text!../version.txt", "./jquery.mobile.widget" ], function( $, __version__ ) { +define( [ "jquery", "../external/requirejs/text!../version.txt", "./jquery.mobile.widget" ], function( $, __version__ ) { //>>excludeEnd("jqmBuildExclude"); (function( $, window, undefined ) { diff --git a/js/jquery.mobile.docs.js b/js/jquery.mobile.docs.js index 9e7ec525..cb8b154a 100644 --- a/js/jquery.mobile.docs.js +++ b/js/jquery.mobile.docs.js @@ -2,5 +2,5 @@ //>>description: jQuery Mobile documentation JS //>>label: Docs -define( [ "./order!./jquery.mobile", "./order!../docs/_assets/js/jqm-docs" ] ); +define( [ "../external/requirejs/order!./jquery.mobile", "../external/requirejs/order!../docs/_assets/js/jqm-docs" ] ); //>>excludeEnd("jqmBuildExclude");