svn commit: r766406 - in /couchdb/trunk/share: Makefile.am server/main.js server/mainjs.sh server/render.js

[ja...@apache.org]

Author: jan
Date: Sat Apr 18 23:32:56 2009
New Revision: 766406

URL: http://svn.apache.org/viewvc?rev=766406&view=rev
Log:
move main.js generation to Makefile

Removed:
    couchdb/trunk/share/server/main.js
    couchdb/trunk/share/server/mainjs.sh
Modified:
    couchdb/trunk/share/Makefile.am
    couchdb/trunk/share/server/render.js

Modified: couchdb/trunk/share/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/trunk/share/Makefile.am?rev=766406&r1=766405&r2=766406&view=diff
==============================================================================
--- couchdb/trunk/share/Makefile.am (original)
+++ couchdb/trunk/share/Makefile.am Sat Apr 18 23:32:56 2009
@@ -10,16 +10,19 @@
 ## License for the specific language governing permissions and limitations
 ## under the License.
 
+# loop.js MUST be last!
 MAKEJS_FILES = \
-    server/loop.js \
     server/render.js \
     server/state.js \
     server/util.js \
     server/validate.js \
-    server/views.js
+    server/views.js \
+    server/loop.js
     
 server/main.js: $(MAKEJS_FILES)
-	server/mainjs.sh
+	@echo "// Generated from *.js by make on `date`" > server/main.js
+	@echo "// DO NOT EDIT BY HAND\n" >> server/main.js
+	@cat $(MAKEJS_FILES) >> server/main.js
 
 CLEANFILES = server/main.js
 

Modified: couchdb/trunk/share/server/render.js
URL: http://svn.apache.org/viewvc/couchdb/trunk/share/server/render.js?rev=766406&r1=766405&r2=766406&view=diff
==============================================================================
--- couchdb/trunk/share/server/render.js (original)
+++ couchdb/trunk/share/server/render.js Sat Apr 18 23:32:56 2009
@@ -10,7 +10,6 @@
 // License for the specific language governing permissions and limitations under
 // the License.
 
-
 // mimeparse.js
 // http://code.google.com/p/mimeparse/
 // Code with comments: http://mimeparse.googlecode.com/svn/trunk/mimeparse.js