Commit 737d8050 authored by Ben Cooksley's avatar Ben Cooksley

Python's sys.platform value changed for FreeBSD12, update accordingly

parent b4b50072
......@@ -33,7 +33,7 @@ if sys.platform == 'win32':
# We use NMake on Windows at the moment
makeCommand = "jom"
# FreeBSD also likes to do things slightly different
if sys.platform == 'freebsd11':
if sys.platform == 'freebsd12':
makeCommand = "gmake -j {cpuCount} -l {maximumLoad}"
# Compile the project
......
......@@ -61,7 +61,7 @@ def generateFor( installPrefix ):
clonedEnv['QT_SELECT'] = 'qt5'
# If this is a Linux/FreeBSD system, making sure we're going to have a UTF-8 environment
if sys.platform == 'linux' or sys.platform == 'freebsd11':
if sys.platform == 'linux' or sys.platform == 'freebsd12':
clonedEnv['LANG'] = 'en_US.UTF-8'
# Mark ourselves as a KDE session, for things like the platform plugin, etc.
......@@ -70,7 +70,7 @@ def generateFor( installPrefix ):
clonedEnv['ASAN_OPTIONS'] = "detect_leaks=0:new_delete_type_mismatch=0:detect_odr_violation=0:stack-use-after-scope=0:alloc_dealloc_mismatch=0"
# On FreeBSD we also want ASAN to be symbolised to aid in debugging
if sys.platform == 'freebsd11':
if sys.platform == 'freebsd12':
clonedEnv['ASAN_OPTIONS'] = "detect_leaks=0:new_delete_type_mismatch=0:detect_odr_violation=0:stack-use-after-scope=0:alloc_dealloc_mismatch=0:symbolize=1"
# All done
......
......@@ -40,7 +40,7 @@ if sys.platform == 'win32':
# We use NMake on Windows at the moment
makeCommand = "jom install"
# FreeBSD also likes to do things slightly different
if sys.platform == 'freebsd11':
if sys.platform == 'freebsd12':
makeCommand = "gmake -j {cpuCount} install"
# Install the project
......
......@@ -95,7 +95,7 @@ buildEnvironment['QT_FORCE_STDERR_LOGGING'] = '1'
buildEnvironment['CTEST_OUTPUT_ON_FAILURE'] = '1'
# Cleanup the builder if needed
if sys.platform == 'freebsd11':
if sys.platform == 'freebsd12':
subprocess.call("killall -9 dbus-daemon kded5 kioslave klauncher kdeinit5 kiod openbox Xvfb", shell=True)
if os.path.exists('/tmp/.X90-lock'):
os.remove('/tmp/.X90-lock')
......@@ -201,7 +201,7 @@ if sys.platform == 'win32':
subprocess.call("taskkill /f /T /im kioslave.exe", shell=True)
subprocess.call("taskkill /f /T /im vctip.exe", shell=True)
if sys.platform == 'freebsd11':
if sys.platform == 'freebsd12':
subprocess.call("killall -9 dbus-daemon kded5 kioslave klauncher kdeinit5 kiod openbox Xvfb", shell=True)
# All done!
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment