Rearrange files, splitting the library from the example(s).

10 years ago · 56532f80ad
parent 5c8948d820
commit 56532f80ad
17 changed files with 22 additions and 15 deletions
--- a/24
+++ b/24
@ -1,6 +1,11 @@
 APP_NAME=MarketplaceChat.app
-APP_SOURCES=index.html index.js marketplace.js style.css
-RESOURCES=$(wildcard app-resources/*)
+LIB_SOURCES=\
+	marketplace.js
+APP_SOURCES=\
+	examples/chat/index.html \
+	examples/chat/index.js \
+	examples/chat/style.css
+RESOURCES=$(wildcard examples/chat/app-resources/*)

 all: $(APP_NAME).zip

@ -22,17 +27,18 @@ clean-keys:
 $(APP_NAME).zip: $(APP_NAME)
 	zip -r $@ $<

-$(APP_NAME): $(APP_SOURCES)
+$(APP_NAME): $(APP_SOURCES) $(LIB_SOURCES)
 	echo RESOURCES $(RESOURCES)
 	rm -rf $@
 	mkdir -p $@/Contents/MacOS
 	mkdir -p $@/Contents/Resources
-	cp app-resources/Info.plist $@/Contents
-	cp app-resources/boot.sh $@/Contents/MacOS
-	cp app-resources/app.icns $@/Contents/Resources
-	cp -r bootstrap $@/Contents/Resources
-	cp jquery*js $@/Contents/Resources
-	cp $(APP_SOURCES) $@/Contents/Resources
+	cp examples/chat/app-resources/Info.plist $@/Contents
+	cp examples/chat/app-resources/boot.sh $@/Contents/MacOS
+	cp examples/chat/app-resources/app.icns $@/Contents/Resources
+	cp -r third-party $@/Contents/Resources
+	cp $(LIB_SOURCES) $@/Contents/Resources
+	mkdir -p $@/Contents/Resources/examples/chat
+	cp $(APP_SOURCES) $@/Contents/Resources/examples/chat
 	chmod a+x $@/Contents/MacOS/boot.sh

 clean:
--- a/examples/chat/app-resources/Info.plist
+++ b/examples/chat/app-resources/Info.plist
--- a/examples/chat/app-resources/app.icns
+++ b/examples/chat/app-resources/app.icns
--- a/examples/chat/app-resources/boot.sh
+++ b/examples/chat/app-resources/boot.sh
@ -1,3 +1,3 @@
 #!/bin/bash
 cd "$(dirname "$0")"/../Resources
-open index.html
+open examples/chat/index.html
--- a/examples/chat/index.html
+++ b/examples/chat/index.html
@ -4,13 +4,13 @@
    <title>JS Marketplace</title>
    <meta charset="utf-8">

-    <link href="bootstrap/css/bootstrap.min.css" rel="stylesheet">
-    <link href="bootstrap/css/bootstrap-responsive.min.css" rel="stylesheet">
+    <link href="../../third-party/bootstrap/css/bootstrap.min.css" rel="stylesheet">
+    <link href="../../third-party/bootstrap/css/bootstrap-responsive.min.css" rel="stylesheet">
    <link href="style.css" rel="stylesheet">
-    <!-- <script src="bootstrap/js/bootstrap.min.js"></script> -->
-    <script src="jquery-2.0.3.min.js"></script>
+    <!-- <script src="../../third-party/bootstrap/js/bootstrap.min.js"></script> -->
+    <script src="../../third-party/jquery-2.0.3.min.js"></script>

-    <script src="marketplace.js"></script>
+    <script src="../../marketplace.js"></script>
    <script src="index.js"></script>
  </head>
  <body>
--- a/examples/chat/index.js
+++ b/examples/chat/index.js
--- a/examples/chat/style.css
+++ b/examples/chat/style.css
--- a/server.rkt
+++ b/server.rkt
@ -1,4 +1,5 @@
 #lang minimart
+;; Generic broker for WebSockets-based minimart/marketplace communication.

 (require net/rfc6455)
 (require minimart/drivers/timer)
--- a/third-party/bootstrap/css/bootstrap-responsive.css
+++ b/third-party/bootstrap/css/bootstrap-responsive.css
--- a/third-party/bootstrap/css/bootstrap-responsive.min.css
+++ b/third-party/bootstrap/css/bootstrap-responsive.min.css
--- a/third-party/bootstrap/css/bootstrap.css
+++ b/third-party/bootstrap/css/bootstrap.css
--- a/third-party/bootstrap/css/bootstrap.min.css
+++ b/third-party/bootstrap/css/bootstrap.min.css
--- a/third-party/bootstrap/img/glyphicons-halflings-white.png
+++ b/third-party/bootstrap/img/glyphicons-halflings-white.png
--- a/third-party/bootstrap/img/glyphicons-halflings.png
+++ b/third-party/bootstrap/img/glyphicons-halflings.png
--- a/third-party/bootstrap/js/bootstrap.js
+++ b/third-party/bootstrap/js/bootstrap.js
--- a/third-party/bootstrap/js/bootstrap.min.js
+++ b/third-party/bootstrap/js/bootstrap.min.js
--- a/third-party/jquery-2.0.3.min.js
+++ b/third-party/jquery-2.0.3.min.js