summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Lehnardt <jan@apache.org>2009-04-18 20:50:33 +0000
committerJan Lehnardt <jan@apache.org>2009-04-18 20:50:33 +0000
commit26f8c77b8f8c04e4fa394de45e82322e7781e9f3 (patch)
tree69850fdd57cad7d14b10fe3e0a15f77bd64b560d
parent3e47bfd6586f42f9fe8e49cea03c4df976c781a1 (diff)
integrate main.js split-up into build system
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@766390 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--share/Makefile.am7
-rwxr-xr-xshare/server/mainjs.sh18
2 files changed, 15 insertions, 10 deletions
diff --git a/share/Makefile.am b/share/Makefile.am
index fda01cdd..f3e1cbad 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -10,11 +10,16 @@
## License for the specific language governing permissions and limitations
## under the License.
+server/main.js:
+ server/mainjs.sh
+
+CLEANFILES = server/main.js
+
nobase_dist_localdata_DATA = \
server/main.js \
www/dialog/_compact_database.html \
- www/dialog/_create_database.html \
www/dialog/_create_document.html \
+ www/dialog/_create_database.html \
www/dialog/_delete_database.html \
www/dialog/_delete_document.html \
www/dialog/_save_view_as.html \
diff --git a/share/server/mainjs.sh b/share/server/mainjs.sh
index 86128423..d8c1798d 100755
--- a/share/server/mainjs.sh
+++ b/share/server/mainjs.sh
@@ -12,13 +12,13 @@
# License for the specific language governing permissions and limitations under
# the License.
-dirname=`dirname $0`
-
+cd server
cat \
- $dirname/render.js \
- $dirname/state.js \
- $dirname/util.js \
- $dirname/validate.js \
- $dirname/views.js \
- $dirname/loop.js \
- > $dirname/main.js
+ render.js \
+ state.js \
+ util.js \
+ validate.js \
+ views.js \
+ loop.js \
+ > main.js
+cd .. \ No newline at end of file