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

List:       kde-commits
Subject:    [websites/build-kde-org/sok-work] config/build: Change windows setup to use cygwin
From:       Scarlett Clark <sgclark () kubuntu ! org>
Date:       2014-12-09 0:33:12
Message-ID: E1Xy8jo-00063X-Fw () scm ! kde ! org
[Download RAW message or body]

Git commit acfea4d7bcce99e83eec1d626864a146c3420bb0 by Scarlett Clark.
Committed on 09/12/2014 at 00:31.
Pushed by scarlettclark into branch 'sok-work'.

Change windows setup to use cygwin
Change linux paths to use default scriptsLocation

M  +2    -2    config/build/linux64-g++.cfg
M  +2    -2    config/build/windows-mingw-w32.cfg

http://commits.kde.org/websites/build-kde-org/acfea4d7bcce99e83eec1d626864a146c3420bb0


diff --git a/config/build/linux64-g++.cfg b/config/build/linux64-g++.cfg
index 387a17a..93574c6 100644
--- a/config/build/linux64-g++.cfg
+++ b/config/build/linux64-g++.cfg
@@ -5,8 +5,8 @@ compiler=g++
 
 [General]
 remoteHostPrefix=jenkins@10.0.0.2:%(remotePrefix)s
-rsyncCommand=%(rsyncExecutable)s --delete-during -rlptgoDavz -e "ssh -p 2222 -i \
                /var/lib/jenkins/\.ssh/id_rsa_jenkins"
-createRemotePathCommand=%(sshExecutable)s -v -x -p 2222 -i \
/var/lib/jenkins/\.ssh/id_rsa_jenkins jenkins@10.0.0.2 mkdir -p {remotePath} \
+rsyncCommand=%(rsyncExecutable)s --delete-during -rlptgoDavz -e "ssh -p 2222" \
+createRemotePathCommand=%(sshExecutable)s -v -x -p 2222 jenkins@10.0.0.2 mkdir -p \
{remotePath}  
 [DependencyInformation]
 remoteHostPrefix=jenkins@10.0.0.2:%(remotePrefix)s
diff --git a/config/build/windows-mingw-w32.cfg b/config/build/windows-mingw-w32.cfg
index 3d1a8f0..9ac0428 100644
--- a/config/build/windows-mingw-w32.cfg
+++ b/config/build/windows-mingw-w32.cfg
@@ -2,13 +2,13 @@
 opSys=windows
 architecture=win32
 compiler=mingw
-scriptsLocation=C:\Jenkins\scripts\
+scriptsLocation=/cydrive/c/scripts
 configurePlatformArgs=-G "MinGW Makefiles"
 makeExecutable=mingw32-make
 sshExecutable=plink
 
 [General]
-installPrefix=C:\Jenkins\install\%(opSys)s\%(architecture)s\%(compiler)s\
+installPrefix=/cydrive/c/Jenkins/install/%(opSys)s/%(architecture)s/%(compiler)s\
 remoteHostPrefix=jenkins@10.0.0.2:%(remotePrefix)s
 rsyncCommand=%(rsyncExecutable)s --delete-during -rlptgoDavz -e "plink"
 createRemotePathCommand=%(sshExecutable)s -v -x -P 2222 -i C:\Jenkins\id_rsa.ppk \
jenkins@10.0.0.2 mkdir -p {remotePath}


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