diff -Nru libqtjambi-snapshot-0.0~201509081631+bzr3576~ubuntu12.04.1/debian/bzr-builder.manifest libqtjambi-snapshot-0.0~201509091631+bzr3581~ubuntu12.04.1/debian/bzr-builder.manifest --- libqtjambi-snapshot-0.0~201509081631+bzr3576~ubuntu12.04.1/debian/bzr-builder.manifest 2015-09-08 16:31:49.000000000 +0000 +++ libqtjambi-snapshot-0.0~201509091631+bzr3581~ubuntu12.04.1/debian/bzr-builder.manifest 2015-09-09 16:31:44.000000000 +0000 @@ -1,3 +1,3 @@ -# bzr-builder format 0.3 deb-version 0.0~201509081631+bzr3576 -lp:~qtjambi-community/qtjambi/master revid:git-v1:7396e9ab433420c10bd2fec35d134616c8cc0174 +# bzr-builder format 0.3 deb-version 0.0~201509091631+bzr3581 +lp:~qtjambi-community/qtjambi/master revid:git-v1:8ef99da63315945e6ab540cc31d66e5b021b69e4 nest debian lp:~qtjambi-community/ubuntu/precise/qtjambi-snapshot/debian debian revid:darryl.miles@darrylmiles.org-20150602171706-aufj1mo4z66duup0 diff -Nru libqtjambi-snapshot-0.0~201509081631+bzr3576~ubuntu12.04.1/debian/changelog libqtjambi-snapshot-0.0~201509091631+bzr3581~ubuntu12.04.1/debian/changelog --- libqtjambi-snapshot-0.0~201509081631+bzr3576~ubuntu12.04.1/debian/changelog 2015-09-08 16:31:49.000000000 +0000 +++ libqtjambi-snapshot-0.0~201509091631+bzr3581~ubuntu12.04.1/debian/changelog 2015-09-09 16:31:44.000000000 +0000 @@ -1,8 +1,8 @@ -libqtjambi-snapshot (0.0~201509081631+bzr3576~ubuntu12.04.1) precise; urgency=low +libqtjambi-snapshot (0.0~201509091631+bzr3581~ubuntu12.04.1) precise; urgency=low * Auto build. - -- qtjambi-community Tue, 08 Sep 2015 16:31:49 +0000 + -- qtjambi-community Wed, 09 Sep 2015 16:31:44 +0000 libqtjambi-snapshot (4.7.4-0ubuntu0) oneiric; urgency=low diff -Nru libqtjambi-snapshot-0.0~201509081631+bzr3576~ubuntu12.04.1/dist/linux/packager-linux.sh libqtjambi-snapshot-0.0~201509091631+bzr3581~ubuntu12.04.1/dist/linux/packager-linux.sh --- libqtjambi-snapshot-0.0~201509081631+bzr3576~ubuntu12.04.1/dist/linux/packager-linux.sh 2015-09-08 16:31:44.000000000 +0000 +++ libqtjambi-snapshot-0.0~201509091631+bzr3581~ubuntu12.04.1/dist/linux/packager-linux.sh 2015-09-09 16:31:37.000000000 +0000 @@ -10,39 +10,47 @@ OS=$(ls build/qtjambi-native-*.jar | cut -sd / -f 2-) OS=${OS:15:7} +COMPILER=gcc RELEASE=qtjambi-$OS-community-$VERSION -COMPILER=gcc +# Clear previous attempts +rm -Rf $RELEASE $RELEASE.tar.gz + +# Create temporary folders mkdir $RELEASE mkdir $RELEASE/bin -#cp version.properties $RELEASE - +# Jars: cp qtjambi-$VERSION.jar $RELEASE cp qtjambi-designer-$VERSION.jar $RELEASE cp qtjambi-examples-$VERSION.jar $RELEASE cp jars/qtjambi-examples-src.jar $RELEASE +cp jars/qtjambi-src.jar $RELEASE cp build/qtjambi-native-$OS-$COMPILER-$VERSION.jar $RELEASE +# Shell scripts: cp dist/linux/examples.sh $RELEASE cp dist/linux/designer.sh $RELEASE cp dist/linux/designer_lib_expander.sh $RELEASE +# Licenses and misc #cp dist/install.html $RELEASE -#cp dist/LGPL_EXCEPTION.TXT $RELEASE +cp dist/changes-$VERSION $RELEASE cp dist/LICENSE.GPL3 $RELEASE cp dist/LICENSE.LGPL $RELEASE -#cp dist/readme.txt $RELEASE +# Juic cp build/qmake-juic/juic $RELEASE/bin +# Qt Designer and other utilities cp $QTDIR/bin/designer $RELEASE/bin cp $QTDIR/bin/linguist $RELEASE/bin cp $QTDIR/bin/lrelease $RELEASE/bin cp $QTDIR/bin/lupdate $RELEASE/bin - +# Pack everything together tar czf $RELEASE.tar.gz $RELEASE +# Remove temporary folder rm -Rf $RELEASE diff -Nru libqtjambi-snapshot-0.0~201509081631+bzr3576~ubuntu12.04.1/dist/mac/packager-osx.sh libqtjambi-snapshot-0.0~201509091631+bzr3581~ubuntu12.04.1/dist/mac/packager-osx.sh --- libqtjambi-snapshot-0.0~201509081631+bzr3576~ubuntu12.04.1/dist/mac/packager-osx.sh 2015-09-08 16:31:44.000000000 +0000 +++ libqtjambi-snapshot-0.0~201509091631+bzr3581~ubuntu12.04.1/dist/mac/packager-osx.sh 2015-09-09 16:31:37.000000000 +0000 @@ -5,44 +5,52 @@ exit 1 fi -OS=macosx VERSION=$(ls qtjambi-4*.jar) VERSION=${VERSION:8:5} -RELEASE=qtjambi-$OS-community-$VERSION + +OS=macosx COMPILER=gcc -JAMBISTUFF=build/platform-output +RELEASE=qtjambi-$OS-community-$VERSION + +# Clear previous attempts +rm -Rf $RELEASE $RELEASE.tar.gz + +# Create temporary folders: mkdir $RELEASE mkdir $RELEASE/bin -cp version.properties $RELEASE - +# Jars: cp qtjambi-$VERSION.jar $RELEASE cp qtjambi-designer-$VERSION.jar $RELEASE cp qtjambi-examples-$VERSION.jar $RELEASE cp jars/qtjambi-examples-src.jar $RELEASE -cp jars/qtjambi-util.jar $RELEASE +cp jars/qtjambi-src.jar $RELEASE cp build/qtjambi-native-$OS-$COMPILER-$VERSION.jar $RELEASE +# Shell scripts: cp dist/mac/qtjambi.sh $RELEASE cp dist/mac/designer.sh $RELEASE cp dist/mac/juic.sh $RELEASE cp dist/mac/installer-osx.sh $RELEASE -#cp set_qtjambi_env.sh $RELEASE + +# Licenses and misc: +#cp dist/install.html $RELEASE cp dist/changes-$VERSION $RELEASE -cp dist/install.html $RELEASE -cp dist/LGPL_EXCEPTION.TXT $RELEASE cp dist/LICENSE.GPL3 $RELEASE cp dist/LICENSE.LGPL $RELEASE -cp dist/readme.txt $RELEASE +# Juic cp build/qmake-juic/juic $RELEASE/bin + +# Qt Designer and other utilities: cp -R $QTDIR/bin/Designer.app $RELEASE/bin cp -R $QTDIR/bin/Linguist.app $RELEASE/bin cp $QTDIR/bin/lrelease $RELEASE/bin cp $QTDIR/bin/lupdate $RELEASE/bin - +# Pack everything together tar czf $RELEASE.tar.gz $RELEASE +# Remove temporary folder rm -Rf $RELEASE diff -Nru libqtjambi-snapshot-0.0~201509081631+bzr3576~ubuntu12.04.1/dist/README.txt libqtjambi-snapshot-0.0~201509091631+bzr3581~ubuntu12.04.1/dist/README.txt --- libqtjambi-snapshot-0.0~201509081631+bzr3576~ubuntu12.04.1/dist/README.txt 2015-09-08 16:31:44.000000000 +0000 +++ libqtjambi-snapshot-0.0~201509091631+bzr3581~ubuntu12.04.1/dist/README.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -This is a pre-release. It will most probably expose bugs. \ No newline at end of file diff -Nru libqtjambi-snapshot-0.0~201509081631+bzr3576~ubuntu12.04.1/dist/win/juic.bat libqtjambi-snapshot-0.0~201509091631+bzr3581~ubuntu12.04.1/dist/win/juic.bat --- libqtjambi-snapshot-0.0~201509081631+bzr3576~ubuntu12.04.1/dist/win/juic.bat 1970-01-01 00:00:00.000000000 +0000 +++ libqtjambi-snapshot-0.0~201509091631+bzr3581~ubuntu12.04.1/dist/win/juic.bat 2015-09-09 16:31:37.000000000 +0000 @@ -0,0 +1,11 @@ +@echo off + +set BASE_DIR=%~dp0 +set BIN_PATH=%BASE_DIR%\bin +set LIB_PATH=%BASE_DIR%\lib +set PATH=%BIN_PATH%;%LIB_PATH%;%PATH% + +REM Launch juic +%BIN_PATH%\juic %* + +endlocal diff -Nru libqtjambi-snapshot-0.0~201509081631+bzr3576~ubuntu12.04.1/dist/win/packager-win.sh libqtjambi-snapshot-0.0~201509091631+bzr3581~ubuntu12.04.1/dist/win/packager-win.sh --- libqtjambi-snapshot-0.0~201509081631+bzr3576~ubuntu12.04.1/dist/win/packager-win.sh 1970-01-01 00:00:00.000000000 +0000 +++ libqtjambi-snapshot-0.0~201509091631+bzr3581~ubuntu12.04.1/dist/win/packager-win.sh 2015-09-09 16:31:37.000000000 +0000 @@ -0,0 +1,64 @@ +#/bin/bash +# In order to run this script in windows you will need a console emulator like cmder (with msysgit) http://cmder.net/ +# Also requires zip to be installed (e.g. http://gnuwin32.sourceforge.net/packages/zip.htm) + +if [ "${QTDIR}" == "" ]; then + echo "Error: QTDIR variable is not set!" + exit 1 +fi + +VERSION=$(ls qtjambi-4*.jar) +VERSION=${VERSION:8:5} + +OS=$(ls build/qtjambi-native-*.jar | cut -sd / -f 2-) +COMPILER=${OS:21:8} +OS=${OS:15:5} + +RELEASE=qtjambi-community-$VERSION-$OS-$COMPILER + +# Clear previous attempts +rm -Rf $RELEASE $RELEASE.zip + +# Create temporary folders: +mkdir $RELEASE +mkdir $RELEASE/bin +mkdir $RELEASE/plugins + +# Jars: +cp qtjambi-$VERSION.jar $RELEASE +cp qtjambi-designer-$VERSION.jar $RELEASE +cp qtjambi-examples-$VERSION.jar $RELEASE +cp jars/qtjambi-examples-src.jar $RELEASE +cp jars/qtjambi-src.jar $RELEASE +cp build/qtjambi-native-$OS-$COMPILER*-$VERSION.jar $RELEASE + +# Shell scripts: +cp dist/win/examples.bat $RELEASE +cp dist/win/designer.bat $RELEASE +cp dist/win/juic.bat $RELEASE + +# Licenses and misc: +#cp dist/install.html $RELEASE +cp dist/changes-$VERSION $RELEASE +cp dist/LICENSE.GPL3 $RELEASE +cp dist/LICENSE.LGPL $RELEASE + +# Juic +cp build/qmake-juic/release/juic $RELEASE/bin + +# Qt Designer and other utilities: +cp $QTDIR/bin/designer $RELEASE/bin +cp $QTDIR/bin/linguist $RELEASE/bin +cp $QTDIR/bin/lrelease $RELEASE/bin +cp $QTDIR/bin/lupdate $RELEASE/bin + +# Libs for Qt Designer +cp -r build/platform-output/lib $RELEASE/lib +# Qt Designer Jambi plugins +cp -r build/platform-output/plugins-designer/* $RELEASE/plugins/ + +# Pack everything together +zip -r $RELEASE.zip $RELEASE + +# Remove temporary folder +rm -Rf $RELEASE diff -Nru libqtjambi-snapshot-0.0~201509081631+bzr3576~ubuntu12.04.1/src/java/ant-qtjambi/com/trolltech/tools/ant/FindCompiler.java libqtjambi-snapshot-0.0~201509091631+bzr3581~ubuntu12.04.1/src/java/ant-qtjambi/com/trolltech/tools/ant/FindCompiler.java --- libqtjambi-snapshot-0.0~201509081631+bzr3576~ubuntu12.04.1/src/java/ant-qtjambi/com/trolltech/tools/ant/FindCompiler.java 2015-09-08 16:31:44.000000000 +0000 +++ libqtjambi-snapshot-0.0~201509091631+bzr3581~ubuntu12.04.1/src/java/ant-qtjambi/com/trolltech/tools/ant/FindCompiler.java 2015-09-09 16:31:37.000000000 +0000 @@ -34,6 +34,8 @@ MSVC2010_64("msvc2010x64"), MSVC2012("msvc2012"), MSVC2012_64("msvc2012x64"), + MSVC2013("msvc2013"), + MSVC2013_64("msvc2013x64"), MinGW("mingw"), MinGW_W64("mingw-w64"), OldGCC("gcc3.3"), @@ -61,6 +63,8 @@ if(name.equals("msvc2010x64")) return MSVC2010_64; if(name.equals("msvc2012")) return MSVC2012; if(name.equals("msvc2012x64")) return MSVC2012_64; + if(name.equals("msvc2013")) return MSVC2013; + if(name.equals("msvc2013x64")) return MSVC2013_64; if(name.equals("mingw")) return MinGW; if(name.equals("mingw-w64")) return MinGW_W64; if(name.equals("gcc3.3")) return OldGCC; @@ -82,6 +86,8 @@ return true; if(compiler == MSVC2012_64) return true; + if(compiler == MSVC2013_64) + return true; return false; } @@ -111,6 +117,8 @@ case MSVC2010_64: case MSVC2012: case MSVC2012_64: + case MSVC2013: + case MSVC2013_64: return true; } return false; @@ -132,6 +140,8 @@ case MSVC2010_64: case MSVC2012: case MSVC2012_64: + case MSVC2013: + case MSVC2013_64: try { String vcdir = System.getenv("VSINSTALLDIR"); if(vcdir == null) { @@ -149,7 +159,7 @@ AntUtil.setNewProperty(props, Constants.VSINSTALLDIR, vcdir); String redistDir; - if(compiler == Compiler.MSVC2005_64 || compiler == Compiler.MSVC2008_64 || compiler == Compiler.MSVC2010_64 || compiler == Compiler.MSVC2012_64) + if(compiler == Compiler.MSVC2005_64 || compiler == Compiler.MSVC2008_64 || compiler == Compiler.MSVC2010_64 || compiler == Compiler.MSVC2012_64 || compiler == Compiler.MSVC2013_64) redistDir = Util.pathCanon(new String[] { vcdir, "vc", "redist", "amd64" }); else redistDir = Util.pathCanon(new String[] { vcdir, "vc", "redist", "x86" }); @@ -175,7 +185,7 @@ void checkCompilerBits() { if(OSInfo.os() == OSInfo.OS.Windows) { boolean vmx64 = OSInfo.osArchName().contains("64"); - boolean compiler64 = compiler == Compiler.MSVC2005_64 || compiler == Compiler.MSVC2008_64 || compiler == Compiler.MSVC2010_64 || compiler == Compiler.MSVC2012_64; + boolean compiler64 = compiler == Compiler.MSVC2005_64 || compiler == Compiler.MSVC2008_64 || compiler == Compiler.MSVC2010_64 || compiler == Compiler.MSVC2012_64 || compiler == Compiler.MSVC2013_64; if(vmx64 != compiler64) { // This is allowed and is not an outright build failure, but warn the user. if(vmx64) @@ -279,8 +289,15 @@ private Compiler testForGCC() { try { + // TODO: there is similar logic for cross compiling for GCC, MinGW and something in InitializeBuildTask too. This should be unified. + String crossCompiler = System.getenv("CROSS_COMPILE"); + String cmd = "gcc"; List cmdAndArgs = new ArrayList(); - cmdAndArgs.add("gcc"); + if(crossCompiler != null) { + System.out.println("NOTE: CROSS_COMPILE has been specified, with value " + crossCompiler + ". compiler executables will be prefixed with this value."); + cmd = crossCompiler += cmd; + } + cmdAndArgs.add(cmd); cmdAndArgs.add("-dumpversion"); String[] sA = Exec.executeCaptureOutput(cmdAndArgs, new File("."), project, null, false); Util.emitDebugLog(project, sA); @@ -309,7 +326,7 @@ patternA[i] = Pattern.compile(regexA[i]); for(String s : sA) { // regex does appear to still work without needing to ensure not multiline ah but habbit - s = s.replace('\r', ' '); + s = s.replace('\r', ' '); s = s.replace('\n', ' '); StringBuilder sb = new StringBuilder(); sb.append(">>" + s); @@ -333,7 +350,11 @@ */ private Compiler testForMinGW() { try { + String crossCompiler = System.getenv("CROSS_COMPILE"); List cmdAndArgs = new ArrayList(); + if(crossCompiler != null) { + cmdAndArgs.add(crossCompiler); + } cmdAndArgs.add("gcc"); cmdAndArgs.add("-v"); String[] sA = Exec.executeCaptureOutput(cmdAndArgs, new File("."), project, null, false); @@ -354,7 +375,6 @@ } private Compiler testForMinGW_W64() { - // FIXME: Prepend $CROSS_COMPILE String crossCompiler = System.getenv("CROSS_COMPILE"); String cmd; if(crossCompiler != null) @@ -419,6 +439,11 @@ return Compiler.MSVC2012_64; return Compiler.MSVC2012; } + if(stderr.contains("18.00")) { + if(stderr.contains("x64")) + return Compiler.MSVC2013_64; + return Compiler.MSVC2013; + } throw new BuildException("Failed to detect Visual Studio version\n \"" + stderr + "\""); } } catch(InterruptedException ex) { @@ -435,3 +460,4 @@ return availableCompilers; } } + diff -Nru libqtjambi-snapshot-0.0~201509081631+bzr3576~ubuntu12.04.1/src/java/ant-qtjambi/com/trolltech/tools/ant/InitializeBuildTask.java libqtjambi-snapshot-0.0~201509091631+bzr3581~ubuntu12.04.1/src/java/ant-qtjambi/com/trolltech/tools/ant/InitializeBuildTask.java --- libqtjambi-snapshot-0.0~201509081631+bzr3576~ubuntu12.04.1/src/java/ant-qtjambi/com/trolltech/tools/ant/InitializeBuildTask.java 2015-09-08 16:31:44.000000000 +0000 +++ libqtjambi-snapshot-0.0~201509091631+bzr3581~ubuntu12.04.1/src/java/ant-qtjambi/com/trolltech/tools/ant/InitializeBuildTask.java 2015-09-09 16:31:37.000000000 +0000 @@ -1280,13 +1280,16 @@ return osname; } - private Compiler solveCompiler(FindCompiler finder) { + private Compiler solveCompiler(FindCompiler finder) { String sourceValue = null; Compiler compiler; Compiler detectedCompiler = finder.decideCompiler(); String compilerValue = AntUtil.getPropertyAsString(propertyHelper, Constants.COMPILER); if(compilerValue == null) { sourceValue = " (available compilers: " + finder.getAvailableCompilers() + "; auto-detected)"; + if(detectedCompiler == null) { + throw new BuildException("ERROR: Compiler was not detected."); + } compilerValue = detectedCompiler.toString(); } else { if("help".equals(compilerValue) || "?".equals(compilerValue)) { diff -Nru libqtjambi-snapshot-0.0~201509081631+bzr3576~ubuntu12.04.1/src/java/ant-qtjambi/com/trolltech/tools/ant/PlatformJarTask.java libqtjambi-snapshot-0.0~201509091631+bzr3581~ubuntu12.04.1/src/java/ant-qtjambi/com/trolltech/tools/ant/PlatformJarTask.java --- libqtjambi-snapshot-0.0~201509081631+bzr3576~ubuntu12.04.1/src/java/ant-qtjambi/com/trolltech/tools/ant/PlatformJarTask.java 2015-09-08 16:31:44.000000000 +0000 +++ libqtjambi-snapshot-0.0~201509091631+bzr3581~ubuntu12.04.1/src/java/ant-qtjambi/com/trolltech/tools/ant/PlatformJarTask.java 2015-09-09 16:31:37.000000000 +0000 @@ -709,6 +709,10 @@ switch(c) { // The manifest based ones... + case MSVC2013: + case MSVC2013_64: + if(vcnumber == null) + vcnumber = "120"; case MSVC2012: case MSVC2012_64: if(vcnumber == null) @@ -1069,3 +1073,4 @@ return sb.toString(); } } +