[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [websites/build-kde-org/sok-work] /: Fix reversed variables. Revert test.
From:       Scarlett Clark <scarlett () scarlettgatelyclark ! com>
Date:       2015-05-01 4:09:58
Message-ID: E1Yo2H0-0000Ot-Pg () scm ! kde ! org
[Download RAW message or body]

Git commit 5a79521936505fbcef4a160771bd6cda18611147 by Scarlett Clark.
Committed on 01/05/2015 at 04:09.
Pushed by scarlettclark into branch 'sok-work'.

Fix reversed variables. Revert test.

M  +0    -2    config/build/kwindowsystem/NoX11.cfg
M  +1    -1    tools/perform-build.py

http://commits.kde.org/websites/build-kde-org/5a79521936505fbcef4a160771bd6cda18611147


diff --git a/config/build/kwindowsystem/NoX11.cfg \
b/config/build/kwindowsystem/NoX11.cfg index 04eb7b2..90b7819 100644
--- a/config/build/kwindowsystem/NoX11.cfg
+++ b/config/build/kwindowsystem/NoX11.cfg
@@ -3,5 +3,3 @@ configureExtraArgs=-DCMAKE_DISABLE_FIND_PACKAGE_X11=TRUE
 
 [Build]
 deployInstallation=False
-[Build]
-configureCommand=%(configureExecutable)s %(configurePlatformArgs)s \
%(configureExtraArgs)s -DCMAKE_BUILD_TYPE=%(cmakeBuildType)s -DBUILD_TESTING=ON \
-DSIP_DEFAULT_SIP_DIR={instPrefix}/share/sip/ -DCMAKE_VERBOSE_MAKEFILE=true \
-DCMAKE_INSTALL_PREFIX={instPrefix} {sources} \ No newline at end of file
diff --git a/tools/perform-build.py b/tools/perform-build.py
index 4bccaa2..2cdcd59 100644
--- a/tools/perform-build.py
+++ b/tools/perform-build.py
@@ -17,7 +17,7 @@ environmentArgs = check_jenkins_environment()
 arguments = parser.parse_args( namespace=environmentArgs )
 
 # Load our configuration, projects and dependencies
-config = load_project_configuration( arguments.project, arguments.branchGroup, \
arguments.platform, arguments.variation, arguments.compiler ) +config = \
load_project_configuration( arguments.project, arguments.branchGroup, \
arguments.platform, arguments.compiler, arguments.variation )  if not load_projects( \
'kde_projects.xml', 'http://projects.kde.org/kde_projects.xml', 'config/projects', \
'dependencies/logical-module-structure' ):  sys.exit("Failure to load projects - \
unable to continue")  load_project_dependencies( 'config/base/', \
arguments.branchGroup, arguments.platform, 'dependencies/' )


[prev in list] [next in list] [prev in thread] [next in thread]