Browse Source

fixes the usage of xvfb in the build engine and a typo in README. Refs: #14.

Ivan Denisov 10 years ago
parent
commit
03e9d31fec
2 changed files with 2 additions and 7 deletions
  1. 1 1
      README.txt
  2. 1 6
      appbuild/build.py

+ 1 - 1
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
     

+ 1 - 6
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):