Changeset 839

Timestamp:

08/18/08 22:09:53 (3 months ago)

Author:

liamstask

Message:

- update release script for os x
- slight update to Builder to ensure the build directory is correct

Location:

mcbuilder/trunk

Files:

• resources/installer/osx/dist.sh (modified) (2 diffs)
• src/Builder.cpp (modified) (1 diff)

mcbuilder/trunk/resources/installer/osx/dist.sh

@@ -29 +29 @@
 
 echo getting firmware source...
-mkdir mcbuilder/resources/cores
-mkdir mcbuilder/resources/cores/makecontroller
+mkdir -p mcbuilder/cores/makecontroller/core
+mkdir mcbuilder/cores/makecontroller/libraries
 # ...do an svn export of the latest tag in the MakingThings firmware SVN repo first
-# svn export https://makingthings.svn.sourceforge.net/svnroot/makingthings/firmware/tags/firmware-v1.3.1 firmware
-cp -r firmware/controller/* mcbuilder/resources/cores/makecontroller
+# svn export https://makingthings.svn.sourceforge.net/svnroot/makingthings/firmware/tags/firmware-v1.5.1 firmware
+cp -r firmware/core/* mcbuilder/cores/makecontroller/core
+cp -r firmware/libraries/* mcbuilder/cores/makecontroller/libraries
 
 echo getting reference material...
@@ -46 +47 @@
 mv tmp/osx-intel/* mcbuilder/resources/tools
 rm -Rf tmp
-
-# add the core libraries
-cp -r libraries mcbuilder
 
 # remove any crap

mcbuilder/trunk/src/Builder.cpp

@@ -77 +77 @@
 {
   currentProjectPath = projectName;
-  ensureBuildDirExists(currentProjectPath);
-  QDir buildDir(currentProjectPath + "/build");
+  QDir buildDir(ensureBuildDirExists(currentProjectPath));
   setWorkingDirectory(buildDir.path());
   if(!buildDir.exists("Makefile"))