Mode files to a more logical location

simonmacmullen · Apr 22, 2015 · bf4edef · bf4edef
1 parent cafc91a
commit bf4edef
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 5 deletions.
diff --git a/build.sh b/build.sh
@@ -7,4 +7,4 @@ MODE=$2
 ./copy-mode-files.sh $MODE
 
 RESOURCE_PATH=$(find . -path './resources*.xml' | xargs | tr ' ' ':')
-monkeyc -o bin/$MODE-datafield.prg -d $DEVICE -m manifest-$MODE.xml -z $RESOURCE_PATH src/*.mc
+monkeyc -o bin/$MODE-datafield.prg -d $DEVICE -m modes/$MODE/manifest.xml -z $RESOURCE_PATH src/*.mc
diff --git a/copy-mode-files.sh b/copy-mode-files.sh
@@ -1,5 +1,5 @@
 #!/bin/sh -e
 MODE=$1
-cp modes/strings-$MODE.xml resources/strings.xml
-cp modes/mode-$MODE.mc src/mode.mc
+cp modes/$MODE/strings.xml resources/strings.xml
+cp modes/$MODE/mode.mc src/mode.mc
 
diff --git a/manifest-hr.xml → modes/hr/manifest.xml b/manifest-hr.xml → modes/hr/manifest.xml
diff --git a/modes/mode-hr.mc → modes/hr/mode.mc b/modes/mode-hr.mc → modes/hr/mode.mc
diff --git a/modes/strings-hr.xml → modes/hr/strings.xml b/modes/strings-hr.xml → modes/hr/strings.xml
diff --git a/manifest-pace.xml → modes/pace/manifest.xml b/manifest-pace.xml → modes/pace/manifest.xml
diff --git a/modes/mode-pace.mc → modes/pace/mode.mc b/modes/mode-pace.mc → modes/pace/mode.mc
diff --git a/modes/strings-pace.xml → modes/pace/strings.xml b/modes/strings-pace.xml → modes/pace/strings.xml
diff --git a/package.sh b/package.sh
@@ -10,5 +10,5 @@ monkeyc -e \
     -o bin/$MODE-datafield.iq \
     -w \
     -z $RESOURCE_PATH \
-    -m manifest-$MODE.xml \
+    -m modes/$MODE/manifest.xml \
     src/*.mc
diff --git a/resources/strings.xml b/resources/strings.xml
@@ -1,3 +1,3 @@
 <resources>
-    <string id="AppName">Pace Chart</string>
+    <string id="AppName">HR Chart</string>
 </resources>