Merge pull request #30 from BlackBoxCenter/issue-#14

Refs: #14.

README.txt

@@ -28,7 +28,7 @@ For compiling and linking the BlackBox Component Builder from sources:
         2) C:\MinGW\bin>windres.exe -i C:\bbcb\Win\Rsrc\BlackBox.rc -o C:\bbcb\Win\Rsrc\BlackBox.res
 
     - Example for Linux Ubuntu:    
-        1) sudo apt-get install wingw32
+        1) sudo apt-get install mingw32
         2) Go to the directory with sources
         3) /usr/bin/i586-mingw32msvc-windres -i BlackBox.rc -o BlackBox.res
     

appbuild/build.py

@@ -41,7 +41,7 @@ localRepository = "/var/www/git/blackbox.git"
 unstableDir = "/var/www/zenario/unstable"
 stableDir = "/var/www/zenario/stable"
 wine = "/usr/local/bin/wine"
-bbscript = "export DISPLAY=:1 && " + wine + " bbscript.exe"
+bbscript = "xvfb-run --server-args='-screen 1, 1024x768x24' " + wine + " bbscript.exe"
 iscc = "/usr/local/bin/iscc"
 windres="/usr/bin/i586-mingw32msvc-windres"
 testName = "testbuild"
@@ -170,11 +170,6 @@ def prepareCompileAndLink():
     shellExec(bbDir + "/Win/Rsrc", windres + " -i BlackBox.rc -o BlackBox.res")
     logStep("Preparing bbscript.exe")
     shellExec(buildDir, "cp bbscript.exe " + bbDir + "/")
-    logStep("Starting Xvfb")
-    if os.path.exists("/tmp/.X1-lock"):
-        log("Xvfb is already running: /tmp/.X1-lock exists")
-    else:
-        shellExec(buildDir, "Xvfb :1 &")
 
 def deleteBbFile(name):
     if os.path.exists(bbDir + "/" + name):
@@ -217,11 +212,11 @@ def appendSystemProperties():
     runbbscript("appbuild/appendProps.txt")
 
 def updateBbscript():
-    if not args.test:
+    if not args.test and branch == "master":
         logStep("Updating bbscript.exe")
         shellExec(bbDir, "mv bbscript.exe " + buildDir + "/")
     else:
-        logStep("Removing bbscript.exe becaue this is a test build")
+        logStep("Removing bbscript.exe")
         shellExec(bbDir, "rm bbscript.exe ")
 
 def buildSetupFile():
@@ -229,7 +224,7 @@ def buildSetupFile():
     deleteBbFile("StdLog.txt");
     deleteBbFile("wine_out.txt");
     deleteBbFile("README.txt");
-    shellExec(bbDir, "rm -R Cons Interp Script appbuild", False)
+    shellExec(bbDir, "rm -R Script appbuild")
     shellExec(bbDir, iscc + " - < Win/Rsrc/BlackBox.iss" \
                   + '  "/dAppVersion=' + appVersion
                   + '" "/dAppVerName=' + appVerName