Build pdx using parent directory name

Previously, this always used "playdate.pdx", which would overwrite other games with the same name when uploaded to device. The parent directory name is now used instead. This was chosen over `projectName()` so VSC can still reliably find the built PDX using `{workspaceFolderBasename}`.
samdze · Nov 26, 2023 · f7e52e5 · f7e52e5
1 parent 5d3a294
commit f7e52e5
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -10,7 +10,7 @@ jobs:
       # prompts so we can do a headless install
     - name: Force non-interactive apt installations
       run: echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
-    
+
     - name: Update dependencies
       run: apt-get update
     - name: Install dependencies
@@ -107,4 +107,4 @@ jobs:
 
     - name: Run headless test
       working-directory: ./tests
-      run: xvfb-run ../PlaydateSDK-*/bin/PlaydateSimulator playdate.pdx
+      run: xvfb-run ../PlaydateSDK-*/bin/PlaydateSimulator tests.pdx
diff --git a/playdate_example/.gitignore b/playdate_example/.gitignore
@@ -1,3 +1,3 @@
-playdate.pdx
+*.pdx
 source/pdex.*
-*.dSYM
+*.dSYM
diff --git a/playdate_example/.vscode/launch.json b/playdate_example/.vscode/launch.json
@@ -10,7 +10,7 @@
             "name": "Debug PDX",
             "program": "${env:PLAYDATE_SDK_PATH}/bin/Playdate Simulator",
             "args": [
-                "${workspaceFolder}/playdate.pdx"
+                "${workspaceFolder}/${workspaceFolderBasename}.pdx"
             ],
             "cwd": "${workspaceFolder}",
             "osx": {
@@ -33,7 +33,7 @@
             "program": "${env:PLAYDATE_SDK_PATH}/bin/Playdate Simulator",
             "preLaunchTask": "Build Universal PDX",
             "args": [
-                "${workspaceFolder}/playdate.pdx"
+                "${workspaceFolder}/${workspaceFolderBasename}.pdx"
             ],
             "cwd": "${workspaceFolder}",
             "osx": {
@@ -56,7 +56,7 @@
             "program": "${env:PLAYDATE_SDK_PATH}/bin/Playdate Simulator",
             "preLaunchTask": "Build Simulator PDX",
             "args": [
-                "${workspaceFolder}/playdate.pdx"
+                "${workspaceFolder}/${workspaceFolderBasename}.pdx"
             ],
             "cwd": "${workspaceFolder}",
             "osx": {
@@ -92,4 +92,4 @@
             }
         }
     ]
-}
+}
diff --git a/src/playdate/build/nimble.nim b/src/playdate/build/nimble.nim
@@ -9,8 +9,9 @@ when not compiles(task):
 
 
 proc bundlePDX() =
-    ## Bundles the pdx file
-    exec(pdcPath() & " --verbose -sdkpath " & sdkPath() & " source playdate")
+    ## Bundles pdx file using parent directory name.
+    exec(pdcPath() & " --verbose -sdkpath " & sdkPath() & " source " &
+      thisDir().splitPath.tail)
 
 proc postBuild(target: Target) =
     ## Performs post-build cleanup and prepares files for bundling.

diff --git a/tests/.gitignore b/tests/.gitignore
@@ -1,3 +1,3 @@
-playdate.pdx
+*.pdx
 source/pdex.*
-*.dSYM
+*.dSYM