This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/cleanup in repository x2goclient. commit 7ff025e97ad8325ca155c280ab118326bab1872c Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Mar 5 23:37:35 2015 +0100 Windows: convert and delete the other config or build scripts. Delete obsolete ones. --- build_win_plugin.bat | 12 +++++++++++- config_win.sh | 5 ----- config_win_console.sh | 4 ---- config_win_plugin.bat | 10 +++++++--- config_win_plugin.sh | 4 ---- debian/changelog | 2 ++ 6 files changed, 20 insertions(+), 17 deletions(-) diff --git a/build_win_plugin.bat b/build_win_plugin.bat index 61989d0..4da4823 100755 --- a/build_win_plugin.bat +++ b/build_win_plugin.bat @@ -1,7 +1,17 @@ +cd plugin_build + mingw32-make + copy release\npx2goplugin.dll d:\share\plugin\x2goplugin\ + d: -cd \share\plugin\x2goplugin\ + +cd share\plugin\x2goplugin\ + idc.exe npx2goplugin.dll /idl npx2goplugin.idl -version 1.0 + midl npx2goplugin.idl /nologo /tlb npx2goplugin.tlb + idc.exe npx2goplugin.dll /tlb npx2goplugin.tlb + +cd .. diff --git a/config_win.sh b/config_win.sh deleted file mode 100755 index a03b3e4..0000000 --- a/config_win.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -make distclean - -/usr/local/Trolltech/Qt-4.7.1/bin/qmake -spec win32-x-g++ diff --git a/config_win_console.sh b/config_win_console.sh deleted file mode 100755 index 1426d6f..0000000 --- a/config_win_console.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -make distclean -/usr/local/Trolltech/Qt-4.7.1/bin/qmake -spec win32-x-g++-console diff --git a/config_win_plugin.bat b/config_win_plugin.bat index 8200d4d..5541764 100755 --- a/config_win_plugin.bat +++ b/config_win_plugin.bat @@ -1,4 +1,8 @@ -mingw32-make distclean -set X2GO_CLIENT_TARGET=plugin -qmake +rmdir /s /q plugin_build +mkdir plugin_build + +set X2GO_CLIENT_TARGET=plugin +qmake ..\x2goclient.pro + +cd .. diff --git a/config_win_plugin.sh b/config_win_plugin.sh deleted file mode 100755 index e274083..0000000 --- a/config_win_plugin.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -make distclean -X2GO_CLIENT_TARGET=plugin /usr/local/Trolltech/Qt-4.7.1/bin/qmake -config release -spec win32-x-g++ diff --git a/debian/changelog b/debian/changelog index 16e2c13..a86377b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -176,6 +176,8 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low x2goclient.pro. - Windows: move building into client_build subdirectory. Also needs the changes in buildscripts.git. + - Windows: convert and delete the other config or build scripts. Delete + obsolete ones. -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 13:25:28 +0100 -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git