chore(build): use relative path for shell (#433)

Signed-off-by: Alex Chi <[email protected]>

Author: skyzh

build_support/build-web-shell.sh

@@ -7,6 +7,10 @@ cd "$DIR/.."
 
 BUSTUB_PRIVATE_VERSION="$(git -C "${DIR}/../.." describe --always --dirty)"
 BUSTUB_PUBLIC_VERSION="$(git -C "${DIR}/../../bustub_public" describe --always --dirty)"
+BUSTUB_BUILD_TIME="$(date +%Y%m%d)"
+
+BUSTUB_SHELL_DIRECTORY="bustub"
+BUSTUB_BPT_DIRECTORY="bpt-printer"
 
 mkdir -p cmake-build-wasm
 cd cmake-build-wasm
@@ -19,22 +23,24 @@ cp ../LICENSE deploy
 cp ../tools/wasm-shell/extra_files/vercel.json deploy
 
 make -j$(nproc) wasm-shell
-mkdir -p deploy/shell
-cp bin/bustub-wasm-shell.js deploy/shell
-cp bin/bustub-wasm-shell.wasm deploy/shell
-cp -a ../tools/wasm-shell/extra_files/index.html deploy/shell
-cp ../logo/bustub.svg deploy/shell
-sed -i '' "s|\${BUSTUB_PRIVATE_VERSION}|${BUSTUB_PRIVATE_VERSION}|" deploy/shell/index.html
-sed -i '' "s|\${BUSTUB_PUBLIC_VERSION}|${BUSTUB_PUBLIC_VERSION}|" deploy/shell/index.html
+mkdir -p "deploy/${BUSTUB_SHELL_DIRECTORY}"
+cp bin/bustub-wasm-shell.js "deploy/${BUSTUB_SHELL_DIRECTORY}"
+cp bin/bustub-wasm-shell.wasm "deploy/${BUSTUB_SHELL_DIRECTORY}"
+cp -a ../tools/wasm-shell/extra_files/index.html "deploy/${BUSTUB_SHELL_DIRECTORY}"
+cp ../logo/bustub.svg "deploy/${BUSTUB_SHELL_DIRECTORY}"
+sed -i '' "s|\${BUSTUB_PRIVATE_VERSION}|${BUSTUB_PRIVATE_VERSION}|" "deploy/${BUSTUB_SHELL_DIRECTORY}/index.html"
+sed -i '' "s|\${BUSTUB_PUBLIC_VERSION}|${BUSTUB_PUBLIC_VERSION}|" "deploy/${BUSTUB_SHELL_DIRECTORY}/index.html"
+sed -i '' "s|\${BUSTUB_BUILD_TIME}|${BUSTUB_BUILD_TIME}|" "deploy/${BUSTUB_SHELL_DIRECTORY}/index.html"
 
 make -j$(nproc) wasm-bpt-printer
-mkdir -p deploy/bpt-printer
-cp bin/bustub-wasm-bpt-printer.js deploy/bpt-printer
-cp bin/bustub-wasm-bpt-printer.wasm deploy/bpt-printer
-cp -a ../tools/wasm-bpt-printer/extra_files/index.html deploy/bpt-printer
-cp ../logo/bustub.svg deploy/bpt-printer
-sed -i '' "s|\${BUSTUB_PRIVATE_VERSION}|${BUSTUB_PRIVATE_VERSION}|" deploy/bpt-printer/index.html
-sed -i '' "s|\${BUSTUB_PUBLIC_VERSION}|${BUSTUB_PUBLIC_VERSION}|" deploy/bpt-printer/index.html
-
-ls -alh deploy/shell
-ls -alh deploy/bpt-printer
+mkdir -p "deploy/${BUSTUB_BPT_DIRECTORY}"
+cp bin/bustub-wasm-bpt-printer.js "deploy/${BUSTUB_BPT_DIRECTORY}"
+cp bin/bustub-wasm-bpt-printer.wasm "deploy/${BUSTUB_BPT_DIRECTORY}"
+cp -a ../tools/wasm-bpt-printer/extra_files/index.html "deploy/${BUSTUB_BPT_DIRECTORY}"
+cp ../logo/bustub.svg "deploy/${BUSTUB_BPT_DIRECTORY}"
+sed -i '' "s|\${BUSTUB_PRIVATE_VERSION}|${BUSTUB_PRIVATE_VERSION}|" "deploy/${BUSTUB_BPT_DIRECTORY}/index.html"
+sed -i '' "s|\${BUSTUB_PUBLIC_VERSION}|${BUSTUB_PUBLIC_VERSION}|" "deploy/${BUSTUB_BPT_DIRECTORY}/index.html"
+sed -i '' "s|\${BUSTUB_BUILD_TIME}|${BUSTUB_BUILD_TIME}|" "deploy/${BUSTUB_BPT_DIRECTORY}/index.html"
+
+ls -alh "deploy/${BUSTUB_SHELL_DIRECTORY}"
+ls -alh "deploy/${BUSTUB_BPT_DIRECTORY}"

tools/wasm-bpt-printer/extra_files/index.html

@@ -40,7 +40,7 @@
 
     .terminal::after {
         content: "";
-        background-image: url("/bpt-printer/bustub.svg");
+        background-image: url("bustub.svg");
         opacity: 0.02;
         top: -50%;
         left: -50%;
@@ -69,11 +69,12 @@
     }
 </style>
 
-<script src="/bpt-printer/bustub-wasm-bpt-printer.js"></script>
+<script src="bustub-wasm-bpt-printer.js"></script>
 
 <script type="text/javascript">
     const BUSTUB_PUBLIC_VERSION_VAR = "${BUSTUB_PUBLIC_VERSION}"
     const BUSTUB_PRIVATE_VERSION_VAR = "${BUSTUB_PRIVATE_VERSION}"
+    const BUSTUB_BUILD_TIME_VAR = "${BUSTUB_BUILD_TIME}"
     const viz = new Viz()
 
     Module['onRuntimeInitialized'] = function () {
@@ -152,7 +153,7 @@
 BusTub is a relational database management system built at Carnegie Mellon University for the Introduction to Database Systems (15-445/645) course. This system was developed for educational purposes and should not be used in production environments. [[!;;;;https://github.com/cmu-db/bustub]BusTub on GitHub] [[!;;;;https://15445.courses.cs.cmu.edu/]Course Website] [[!;;;;https://github.com/cmu-db/bustub/issues/new]Report Bugs]
 
 ${helpMessage}
-This is BusTub reference solution running in your browser. Solution Version: ${BUSTUB_PRIVATE_VERSION_VAR}, BusTub Version: ${BUSTUB_PUBLIC_VERSION_VAR}.
+This is BusTub reference solution running in your browser. Solution Version: ${BUSTUB_PRIVATE_VERSION_VAR}, BusTub Version: ${BUSTUB_PUBLIC_VERSION_VAR}, built at ${BUSTUB_BUILD_TIME_VAR}.
 `,
             prompt: () => initialized ? "[[b;;]printer> ]" : "leaf_max_size and internal_max_size? (e.g., 3 3) "
         })

tools/wasm-shell/extra_files/index.html

@@ -35,7 +35,7 @@
 
     .terminal::after {
         content: "";
-        background-image: url("/shell/bustub.svg");
+        background-image: url("bustub.svg");
         opacity: 0.02;
         top: -50%;
         left: -50%;
@@ -57,11 +57,12 @@
     }
 </style>
 
-<script src="/shell/bustub-wasm-shell.js"></script>
+<script src="bustub-wasm-shell.js"></script>
 
 <script type="text/javascript">
     const BUSTUB_PUBLIC_VERSION_VAR = "${BUSTUB_PUBLIC_VERSION}"
     const BUSTUB_PRIVATE_VERSION_VAR = "${BUSTUB_PRIVATE_VERSION}"
+    const BUSTUB_BUILD_TIME_VAR = "${BUSTUB_BUILD_TIME}"
 
     Module['onRuntimeInitialized'] = function () {
         const executeQuery = Module.cwrap('BustubExecuteQuery', 'number', ['string', 'number', 'number'])
@@ -110,7 +111,7 @@
 
 Use \\help to learn about the usage. Use \\clear to clear the page.
 
-This is BusTub reference solution running in your browser. Solution Version: ${BUSTUB_PRIVATE_VERSION_VAR}, BusTub Version: ${BUSTUB_PUBLIC_VERSION_VAR}.
+This is BusTub reference solution running in your browser. Solution Version: ${BUSTUB_PRIVATE_VERSION_VAR}, BusTub Version: ${BUSTUB_PUBLIC_VERSION_VAR}, built at ${BUSTUB_BUILD_TIME_VAR}.
 `,
             prompt: () => line.length == 0 ? "[[b;;]bustub> ]" : "[[b;;]... ]"
         })

tools/wasm-shell/extra_files/vercel.json

@@ -5,7 +5,7 @@
     "redirects": [
         {
             "source": "/",
-            "destination": "/shell/"
+            "destination": "/bustub/"
         }
     ],
     "trailingSlash": true