|
From: Rob M. <man...@us...> - 2010-01-17 22:10:46
|
Update of /cvsroot/squirrel-sql/sql12/build/rpm/patches In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv8464/rpm/patches Added Files: ant-javac-encoding.patch build-remove-findbugs-pmd-deps.patch build.properties.standard-plugins.patch fix-install-patch.pl install.patch launch-script.patch Log Message: added initial release of RPM building scripts which is documented here: https://sourceforge.net/apps/trac/squirrel-sql/wiki/SQuirreLRPM --- NEW FILE: fix-install-patch.pl --- #! /usr/bin/perl $compileroot = `pwd`; $compileroot =~ s/SOURCES/BUILD/; $compileroot =~ s/\s*//g; $compileroot .= '/squirrel-sql'; print "Enter the version being built: "; $version=<STDIN>; chomp($version); open(FILE, 'install.patch'); @lines = <FILE>; close(FILE); $searchpattern1 = '\+cvs\.dest\.dir\='; $searchpattern2 = '\+appversion\='; open(OUT, '> install.patch'); for $line (@lines) { if ($line =~ /$searchpattern1/) { $line = '+cvs.dest.dir=' . $compileroot . "\n"; } if ($line =~ /$searchpattern2/) { $line = '+appversion=' . $version . "\n"; } print OUT $line; } close(OUT); --- NEW FILE: install.patch --- --- sql12/build/snapshot/autoinstall.xml.template.orig 2008-03-16 18:20:18.000000000 -0400 +++ sql12/build/snapshot/autoinstall.xml.template 2010-01-09 17:22:28.000000000 -0500 @@ -8,33 +8,6 @@ <com.izforge.izpack.panels.PacksPanel> <pack name="Base" index="0" selected="true"/> <pack name="Standard" index="1" selected="true"/> - <pack name="Optional Plugin - Data import" index="2" selected="true"/> - <pack name="Optional Plugin - DBCopy" index="3" selected="true"/> - <pack name="Optional Plugin - DB2" index="4" selected="true"/> - <pack name="Optional Plugin - Derby" index="5" selected="true"/> - <pack name="Optional Plugin - Firebird" index="6" selected="true"/> - <pack name="Optional Plugin - Hibernate" index="7" selected="true"/> - <pack name="Optional Plugin - H2" index="8" selected="true"/> - <pack name="Optional Plugin - Informix" index="9" selected="true"/> - <pack name="Optional Plugin - Microsoft SQL Server" index="10" selected="true"/> - <pack name="Optional Plugin - MySQL" index="11" selected="true"/> - <pack name="Optional Plugin - Oracle" index="12" selected="true"/> - <pack name="Optional Plugin - PostgreSQL" index="13" selected="true"/> - <pack name="Optional Plugin - Refactoring" index="14" selected="true"/> - <pack name="Optional Plugin - Session Scripts" index="15" selected="true"/> - <pack name="Optional Plugin - SQL Parametrisation" index="16" selected="true"/> - <pack name="Optional Plugin - SQL Replace" index="17" selected="true"/> - <pack name="Optional Plugin - SQL Validator" index="18" selected="true"/> - <pack name="Optional Plugin - Sybase" index="19" selected="true"/> - <pack name="Optional Plugin - Internationalization" index="20" selected="true"/> - <pack name="Optional Translation - Brazilian Portuguese" index="21" selected="false"/> - <pack name="Optional Translation - Bulgarian" index="22" selected="false"/> - <pack name="Optional Translation - Czech" index="23" selected="false"/> - <pack name="Optional Translation - Simplified Chinese" index="24" selected="false"/> - <pack name="Optional Translation - French" index="25" selected="false"/> - <pack name="Optional Translation - German" index="26" selected="false"/> - <pack name="Optional Translation - Italian" index="27" selected="false"/> - <pack name="Optional Translation - Spanish" index="28" selected="false"/> </com.izforge.izpack.panels.PacksPanel> <com.izforge.izpack.panels.InstallPanel/> <!-- <com.izforge.izpack.panels.ShortcutPanel/> --> --- sql12/build/snapshot/build-weekly.properties.orig 2008-05-25 14:47:40.000000000 -0400 +++ sql12/build/snapshot/build-weekly.properties 2010-01-09 17:22:45.000000000 -0500 @@ -11,7 +11,7 @@ # version that's used in the name of the installer file - this isn't used if # building a snapshot release (that is, if replace.version is set to true) -appversion=2.7 +appversion=3.0.3 # cvs repository cvsroot to checkout the source from. project.cvsroot=:ext:man...@sq...:/cvsroot/squirrel-sql @@ -23,11 +23,11 @@ cvs.tag=HEAD # What temporary directory to checkout to in order to perform the build in. -cvs.dest.dir=/home/manningr/weeklybuild +cvs.dest.dir=/home/manningr/rpmbuild/BUILD/squirrel-sql # Delete what's in cvs.dest.dir and do a fresh checkout or simply update it # and do a clean. -delete.dest.dir=true +delete.dest.dir=false # The Version.java template file that contains a marker for where to insert the # snapshot number. @@ -36,7 +36,7 @@ # If true, this replaces the version source file with the template that can be # used to create a snapshot version. Otherwise, the stock Version.java that's # on the CVS trunk is used to compile. -replace.version=true +replace.version=false # The location in the temp build area for where to place the Version.java file # once the template has been filtered. @@ -72,7 +72,7 @@ # The directory that the application gets installed into for build verification # testing -bv.install.dir=/tmp/squirreltest +bv.install.dir=/var/tmp/squirrel-sql-root/opt/SQuirreLSQLClient # The launch script for the application launch.file=${bv.install.dir}/squirrel-sql.sh --- NEW FILE: build.properties.standard-plugins.patch --- --- sql12/build/build.properties.orig 2010-01-09 12:19:51.000000000 -0500 +++ sql12/build/build.properties 2010-01-09 12:25:32.000000000 -0500 @@ -9,40 +9,40 @@ # optional plugins set to true. rebuild.plugin.codecompletion=true -rebuild.plugin.dataimport=true -rebuild.plugin.dbcopy=true -rebuild.plugin.dbdiff=true -rebuild.plugin.derby=true -rebuild.plugin.db2=true +rebuild.plugin.dataimport=false +rebuild.plugin.dbcopy=false +rebuild.plugin.dbdiff=false +rebuild.plugin.derby=false +rebuild.plugin.db2=false rebuild.plugin.editextras=true -rebuild.plugin.example=true -rebuild.plugin.exportconfig=true -rebuild.plugin.favs=true -rebuild.plugin.firebird=true -rebuild.plugin.firebirdmanager=true +rebuild.plugin.example=false +rebuild.plugin.exportconfig=false +rebuild.plugin.favs=false +rebuild.plugin.firebird=false +rebuild.plugin.firebirdmanager=false rebuild.plugin.graph=true -rebuild.plugin.hibernate=true -rebuild.plugin.h2=true -rebuild.plugin.informix=true -rebuild.plugin.isqlj=true +rebuild.plugin.hibernate=false +rebuild.plugin.h2=false +rebuild.plugin.informix=false +rebuild.plugin.isqlj=false rebuild.plugin.laf=true -rebuild.plugin.i18n=true -rebuild.plugin.macosx=true -rebuild.plugin.mssql=true -rebuild.plugin.mysql=true -rebuild.plugin.oracle=true -rebuild.plugin.postgres=true +rebuild.plugin.i18n=false +rebuild.plugin.macosx=false +rebuild.plugin.mssql=false +rebuild.plugin.mysql=false +rebuild.plugin.oracle=false +rebuild.plugin.postgres=false rebuild.plugin.refactoring=true -rebuild.plugin.sessionscript=true -rebuild.plugin.smarttools=true +rebuild.plugin.sessionscript=false +rebuild.plugin.smarttools=false rebuild.plugin.sqlbookmark=true -rebuild.plugin.sqlparam=true -rebuild.plugin.sqlreplace=true +rebuild.plugin.sqlparam=false +rebuild.plugin.sqlreplace=false rebuild.plugin.sqlscript=true -rebuild.plugin.sqlval=true -rebuild.plugin.sybase=true +rebuild.plugin.sqlval=false +rebuild.plugin.sybase=false rebuild.plugin.syntax=true -rebuild.plugin.userscript=true +rebuild.plugin.userscript=false # Directory where IzPack is installed - only required @@ -70,4 +70,4 @@ ext.test.config=/home/hudson/hudson-home/jobs/squirrel-sql/workspace/test/external/net/sourceforge/squirrel_sql/fw/dialects/dialectExternalTest.properties # root directory containing all driver jar files needed for external tests -base.jdbc.driver.path=/opt/jdbc-test \ No newline at end of file +base.jdbc.driver.path=/opt/jdbc-test --- NEW FILE: launch-script.patch --- --- sql12/app/cmd/squirrel-sql.sh.orig 2010-01-09 14:28:55.000000000 -0500 +++ sql12/app/cmd/squirrel-sql.sh 2010-01-09 14:29:22.000000000 -0500 @@ -15,9 +15,9 @@ # SQuirreL home. if $macosx ; then - SQUIRREL_SQL_HOME='%INSTALL_PATH/Contents/Resources/Java' + SQUIRREL_SQL_HOME='/opt/SQuirreLSQLClient/Contents/Resources/Java' else - SQUIRREL_SQL_HOME='%INSTALL_PATH' + SQUIRREL_SQL_HOME='/opt/SQuirreLSQLClient' fi # SQuirreL home in Unix format. --- NEW FILE: build-remove-findbugs-pmd-deps.patch --- diff -up sql12/build/build.xml.orig sql12/build/build.xml --- sql12/build/build.xml.orig 2010-01-10 12:17:35.266983214 -0500 +++ sql12/build/build.xml 2010-01-10 12:19:46.030856867 -0500 @@ -93,10 +93,6 @@ <!-- Load <emma>, <emmajava>, <findbugs>, <pmd> and <cpd> custom tasks so that they can be used in ANT --> <taskdef resource="emma_ant.properties" classpathref="emma.lib" /> - <taskdef name="findbugs" - classname="edu.umd.cs.findbugs.anttask.FindBugsTask" /> - <taskdef name="cpd" classname="net.sourceforge.pmd.cpd.CPDTask" /> - <taskdef name="pmd" classname="net.sourceforge.pmd.ant.PMDTask" /> <!-- Classpath that is used to compile tests --> <path id="test.compile.classpath"> @@ -1165,16 +1161,6 @@ <echo message="Findbugs Auxiliary Classpath = ${fb.classpath}"/> --> - <findbugs home="${findbugs.home}" - output="xml" - outputFile="${findbugs.report.dir}/squirrel-fb.xml" - jvmargs="-Xmx512m" - timeout="3600000"> - - <auxclasspath refid="findbugs.aux.classpath" /> - <sourcePath path="${coverage.sources.dir}" /> - <class location="${coverage.classes.dir}" /> - </findbugs> </target> <!-- @@ -1185,16 +1171,6 @@ --> <target name="pmd" depends="init"> <mkdir dir="${pmd.reports.dir}" /> - - <pmd > - <formatter type="xml" toFile="${pmd.reports.dir}/pmd.xml" /> - <fileset dir="${coverage.sources.dir}"> - <include name="**/*.java" /> - </fileset> - <ruleset>basic</ruleset> - <ruleset>unusedcode</ruleset> - </pmd> - </target> <!-- @@ -1205,11 +1181,6 @@ --> <target name="cpd" depends="init"> <mkdir dir="${cpd.reports.dir}" /> - <cpd format="xml" minimumTokenCount="100" outputFile="${cpd.reports.dir}/cpd.xml"> - <fileset dir="${coverage.sources.dir}"> - <include name="**/*.java" /> - </fileset> - </cpd> </target> <!-- --- NEW FILE: ant-javac-encoding.patch --- diff -Naur sql12/build/build.xml sql12.patched/build/build.xml --- sql12/build/build.xml 2010-01-09 10:36:06.000000000 -0500 +++ sql12.patched/build/build.xml 2010-01-09 11:09:15.000000000 -0500 @@ -234,7 +234,7 @@ depends="setup" description="Compiles the framework classes that the app depends on"> <echo message="---------------- Framework ----------------" /> - <javac srcdir="fw/src" + <javac encoding="utf-8" srcdir="fw/src" destdir="${core_obj_dir}" deprecation="${deprecation}" debug="${debug}" @@ -286,7 +286,7 @@ depends="compile_fw" description="Compiles the application but doesn't compile any plugins"> <echo message="---------------- ${name} ----------------" /> - <javac srcdir="app/src" + <javac encoding="utf-8" srcdir="app/src" destdir="${core_obj_dir}" deprecation="${deprecation}" debug="${debug}" @@ -930,7 +930,7 @@ <mkdir dir="${test.classes.dir}" /> <!-- Build the test code --> - <javac destdir="${test.classes.dir}" + <javac encoding="utf-8" destdir="${test.classes.dir}" deprecation="${deprecation}" debug="${debug}" optimize="${optimize}" diff -Naur sql12/plugins/cache/plugin_build.xml sql12.patched/plugins/cache/plugin_build.xml --- sql12/plugins/cache/plugin_build.xml 2008-12-25 21:06:38.000000000 -0500 +++ sql12.patched/plugins/cache/plugin_build.xml 2010-01-09 11:09:15.000000000 -0500 @@ -46,7 +46,7 @@ <mkdir dir="${obj_dir}"/> - <javac srcdir="src" + <javac encoding="utf-8" srcdir="src" destdir="${obj_dir}" deprecation="${deprecation}" debug="${debug}" diff -Naur sql12/plugins/codecompletion/plugin_build.xml sql12.patched/plugins/codecompletion/plugin_build.xml --- sql12/plugins/codecompletion/plugin_build.xml 2008-12-25 21:06:38.000000000 -0500 +++ sql12.patched/plugins/codecompletion/plugin_build.xml 2010-01-09 11:09:15.000000000 -0500 @@ -38,7 +38,7 @@ <mkdir dir="${obj_dir}"/> <mkdir dir="${p_plugin.dist_dir}"/> - <javac srcdir="src" + <javac encoding="utf-8" srcdir="src" destdir="${obj_dir}" deprecation="${deprecation}" debug="${debug}" diff -Naur sql12/plugins/dataimport/plugin_build.xml sql12.patched/plugins/dataimport/plugin_build.xml --- sql12/plugins/dataimport/plugin_build.xml 2008-12-25 21:06:38.000000000 -0500 +++ sql12.patched/plugins/dataimport/plugin_build.xml 2010-01-09 11:09:15.000000000 -0500 @@ -40,7 +40,7 @@ <mkdir dir="${obj_dir}"/> <mkdir dir="${p_plugin.dist_dir}"/> - <javac srcdir="src" + <javac encoding="utf-8" srcdir="src" destdir="${obj_dir}" deprecation="${deprecation}" debug="${debug}" diff -Naur sql12/plugins/db2/plugin_build.xml sql12.patched/plugins/db2/plugin_build.xml --- sql12/plugins/db2/plugin_build.xml 2008-12-25 21:06:38.000000000 -0500 +++ sql12.patched/plugins/db2/plugin_build.xml 2010-01-09 11:09:15.000000000 -0500 @@ -37,7 +37,7 @@ <mkdir dir="${obj_dir}"/> <mkdir dir="${p_plugin.dist_dir}"/> - <javac srcdir="src" + <javac encoding="utf-8" srcdir="src" destdir="${obj_dir}" deprecation="${deprecation}" debug="${debug}" diff -Naur sql12/plugins/dbcopy/plugin_build.xml sql12.patched/plugins/dbcopy/plugin_build.xml --- sql12/plugins/dbcopy/plugin_build.xml 2008-12-25 21:06:38.000000000 -0500 +++ sql12.patched/plugins/dbcopy/plugin_build.xml 2010-01-09 11:09:15.000000000 -0500 @@ -46,7 +46,7 @@ <mkdir dir="${obj_dir}"/> <mkdir dir="${p_plugin.dist_dir}"/> - <javac srcdir="src" + <javac encoding="utf-8" srcdir="src" destdir="${obj_dir}" deprecation="${deprecation}" debug="${debug}" diff -Naur sql12/plugins/dbdiff/plugin_build.xml sql12.patched/plugins/dbdiff/plugin_build.xml --- sql12/plugins/dbdiff/plugin_build.xml 2008-12-25 21:06:36.000000000 -0500 +++ sql12.patched/plugins/dbdiff/plugin_build.xml 2010-01-09 11:09:15.000000000 -0500 @@ -46,7 +46,7 @@ <mkdir dir="${obj_dir}"/> <mkdir dir="${p_plugin.dist_dir}"/> - <javac srcdir="src" + <javac encoding="utf-8" srcdir="src" destdir="${obj_dir}" deprecation="${deprecation}" debug="${debug}" diff -Naur sql12/plugins/derby/plugin_build.xml sql12.patched/plugins/derby/plugin_build.xml --- sql12/plugins/derby/plugin_build.xml 2008-12-25 21:06:36.000000000 -0500 +++ sql12.patched/plugins/derby/plugin_build.xml 2010-01-09 11:09:15.000000000 -0500 @@ -37,7 +37,7 @@ <mkdir dir="${obj_dir}"/> <mkdir dir="${p_plugin.dist_dir}"/> - <javac srcdir="src" + <javac encoding="utf-8" srcdir="src" destdir="${obj_dir}" deprecation="${deprecation}" debug="${debug}" diff -Naur sql12/plugins/editextras/plugin_build.xml sql12.patched/plugins/editextras/plugin_build.xml --- sql12/plugins/editextras/plugin_build.xml 2008-12-25 21:06:38.000000000 -0500 +++ sql12.patched/plugins/editextras/plugin_build.xml 2010-01-09 11:09:15.000000000 -0500 @@ -37,7 +37,7 @@ <mkdir dir="${obj_dir}"/> <mkdir dir="${p_plugin.dist_dir}"/> - <javac srcdir="src" + <javac encoding="utf-8" srcdir="src" destdir="${obj_dir}" deprecation="${deprecation}" debug="${debug}" diff -Naur sql12/plugins/example/plugin_build.xml sql12.patched/plugins/example/plugin_build.xml --- sql12/plugins/example/plugin_build.xml 2008-12-25 21:06:36.000000000 -0500 +++ sql12.patched/plugins/example/plugin_build.xml 2010-01-09 11:09:15.000000000 -0500 @@ -37,7 +37,7 @@ <mkdir dir="${obj_dir}"/> <mkdir dir="${p_plugin.dist_dir}"/> - <javac srcdir="src" + <javac encoding="utf-8" srcdir="src" destdir="${obj_dir}" deprecation="${deprecation}" debug="${debug}" diff -Naur sql12/plugins/exportconfig/plugin_build.xml sql12.patched/plugins/exportconfig/plugin_build.xml --- sql12/plugins/exportconfig/plugin_build.xml 2008-12-25 21:06:38.000000000 -0500 +++ sql12.patched/plugins/exportconfig/plugin_build.xml 2010-01-09 11:09:15.000000000 -0500 @@ -37,7 +37,7 @@ <mkdir dir="${obj_dir}"/> <mkdir dir="${p_plugin.dist_dir}"/> - <javac srcdir="src" + <javac encoding="utf-8" srcdir="src" destdir="${obj_dir}" deprecation="${deprecation}" debug="${debug}" diff -Naur sql12/plugins/favs/plugin_build.xml sql12.patched/plugins/favs/plugin_build.xml --- sql12/plugins/favs/plugin_build.xml 2008-12-25 21:06:36.000000000 -0500 +++ sql12.patched/plugins/favs/plugin_build.xml 2010-01-09 11:09:15.000000000 -0500 @@ -40,7 +40,7 @@ <mkdir dir="${obj_dir}" /> <mkdir dir="${p_plugin.dist_dir}" /> - <javac srcdir="src" + <javac encoding="utf-8" srcdir="src" destdir="${obj_dir}" deprecation="${deprecation}" debug="${debug}" diff -Naur sql12/plugins/firebird/plugin_build.xml sql12.patched/plugins/firebird/plugin_build.xml --- sql12/plugins/firebird/plugin_build.xml 2008-12-25 21:06:36.000000000 -0500 +++ sql12.patched/plugins/firebird/plugin_build.xml 2010-01-09 11:09:15.000000000 -0500 @@ -36,7 +36,7 @@ <mkdir dir="${obj_dir}"/> <mkdir dir="${p_plugin.dist_dir}"/> - <javac srcdir="src" + <javac encoding="utf-8" srcdir="src" destdir="${obj_dir}" deprecation="${deprecation}" debug="${debug}" diff -Naur sql12/plugins/firebirdmanager/plugin_build.xml sql12.patched/plugins/firebirdmanager/plugin_build.xml --- sql12/plugins/firebirdmanager/plugin_build.xml 2008-12-25 21:06:38.000000000 -0500 +++ sql12.patched/plugins/firebirdmanager/plugin_build.xml 2010-01-09 11:09:15.000000000 -0500 @@ -37,7 +37,7 @@ <mkdir dir="${obj_dir}"/> <mkdir dir="${p_plugin.dist_dir}"/> - <javac srcdir="src" + <javac encoding="utf-8" srcdir="src" destdir="${obj_dir}" deprecation="${deprecation}" debug="${debug}" diff -Naur sql12/plugins/graph/plugin_build.xml sql12.patched/plugins/graph/plugin_build.xml --- sql12/plugins/graph/plugin_build.xml 2008-12-25 21:06:36.000000000 -0500 +++ sql12.patched/plugins/graph/plugin_build.xml 2010-01-09 11:09:15.000000000 -0500 @@ -36,7 +36,7 @@ <mkdir dir="${obj_dir}"/> <mkdir dir="${p_plugin.dist_dir}"/> - <javac srcdir="src" + <javac encoding="utf-8" srcdir="src" destdir="${obj_dir}" deprecation="${deprecation}" debug="${debug}" diff -Naur sql12/plugins/h2/plugin_build.xml sql12.patched/plugins/h2/plugin_build.xml --- sql12/plugins/h2/plugin_build.xml 2008-12-25 21:06:38.000000000 -0500 +++ sql12.patched/plugins/h2/plugin_build.xml 2010-01-09 11:09:15.000000000 -0500 @@ -37,7 +37,7 @@ <mkdir dir="${obj_dir}"/> <mkdir dir="${p_plugin.dist_dir}"/> - <javac srcdir="src" + <javac encoding="utf-8" srcdir="src" destdir="${obj_dir}" deprecation="${deprecation}" debug="${debug}" diff -Naur sql12/plugins/hibernate/plugin_build.xml sql12.patched/plugins/hibernate/plugin_build.xml --- sql12/plugins/hibernate/plugin_build.xml 2008-12-25 21:06:36.000000000 -0500 +++ sql12.patched/plugins/hibernate/plugin_build.xml 2010-01-09 11:09:15.000000000 -0500 @@ -37,7 +37,7 @@ <mkdir dir="${obj_dir}"/> <mkdir dir="${p_plugin.dist_dir}"/> - <javac srcdir="src" + <javac encoding="utf-8" srcdir="src" destdir="${obj_dir}" deprecation="${deprecation}" debug="${debug}" diff -Naur sql12/plugins/i18n/plugin_build.xml sql12.patched/plugins/i18n/plugin_build.xml --- sql12/plugins/i18n/plugin_build.xml 2008-12-25 21:06:36.000000000 -0500 +++ sql12.patched/plugins/i18n/plugin_build.xml 2010-01-09 11:09:15.000000000 -0500 @@ -36,7 +36,7 @@ <mkdir dir="${obj_dir}"/> <mkdir dir="${p_plugin.dist_dir}"/> - <javac srcdir="src" + <javac encoding="utf-8" srcdir="src" destdir="${obj_dir}" deprecation="${deprecation}" debug="${debug}" diff -Naur sql12/plugins/informix/plugin_build.xml sql12.patched/plugins/informix/plugin_build.xml --- sql12/plugins/informix/plugin_build.xml 2008-12-25 21:06:38.000000000 -0500 +++ sql12.patched/plugins/informix/plugin_build.xml 2010-01-09 11:09:15.000000000 -0500 @@ -37,7 +37,7 @@ <mkdir dir="${obj_dir}"/> <mkdir dir="${p_plugin.dist_dir}"/> - <javac srcdir="src" + <javac encoding="utf-8" srcdir="src" destdir="${obj_dir}" deprecation="${deprecation}" debug="${debug}" diff -Naur sql12/plugins/isqlj/plugin_build.xml sql12.patched/plugins/isqlj/plugin_build.xml --- sql12/plugins/isqlj/plugin_build.xml 2008-12-25 21:06:36.000000000 -0500 +++ sql12.patched/plugins/isqlj/plugin_build.xml 2010-01-09 11:09:15.000000000 -0500 @@ -36,7 +36,7 @@ <mkdir dir="${obj_dir}"/> <mkdir dir="${p_plugin.dist_dir}"/> - <javac srcdir="src" + <javac encoding="utf-8" srcdir="src" destdir="${obj_dir}" deprecation="${deprecation}" debug="${debug}" diff -Naur sql12/plugins/laf/plugin_build.xml sql12.patched/plugins/laf/plugin_build.xml --- sql12/plugins/laf/plugin_build.xml 2008-12-25 21:06:38.000000000 -0500 +++ sql12.patched/plugins/laf/plugin_build.xml 2010-01-09 11:09:15.000000000 -0500 @@ -38,7 +38,7 @@ <mkdir dir="${obj_dir}"/> <mkdir dir="${p_plugin.dist_dir}"/> - <javac srcdir="src" + <javac encoding="utf-8" srcdir="src" destdir="${obj_dir}" deprecation="${deprecation}" debug="${debug}" diff -Naur sql12/plugins/macosx/plugin_build.xml sql12.patched/plugins/macosx/plugin_build.xml --- sql12/plugins/macosx/plugin_build.xml 2008-12-25 21:06:36.000000000 -0500 +++ sql12.patched/plugins/macosx/plugin_build.xml 2010-01-09 11:09:15.000000000 -0500 @@ -38,7 +38,7 @@ <mkdir dir="${obj_dir}"/> <mkdir dir="${p_plugin.dist_dir}"/> - <javac srcdir="src" + <javac encoding="utf-8" srcdir="src" destdir="${obj_dir}" deprecation="${deprecation}" debug="${debug}" diff -Naur sql12/plugins/mssql/build.xml sql12.patched/plugins/mssql/build.xml --- sql12/plugins/mssql/build.xml 2007-07-25 19:33:42.000000000 -0400 +++ sql12.patched/plugins/mssql/build.xml 2010-01-09 11:09:15.000000000 -0500 @@ -28,7 +28,7 @@ </target> <target name="compile" depends="prepare"> - <javac destdir="${build.classes}" srcdir="${src.dir}" deprecation="on"> + <javac encoding="utf-8" destdir="${build.classes}" srcdir="${src.dir}" deprecation="on"> <classpath refid="squirrel.libraries" /> </javac> </target> diff -Naur sql12/plugins/mssql/plugin_build.xml sql12.patched/plugins/mssql/plugin_build.xml --- sql12/plugins/mssql/plugin_build.xml 2008-12-25 21:06:36.000000000 -0500 +++ sql12.patched/plugins/mssql/plugin_build.xml 2010-01-09 11:09:15.000000000 -0500 @@ -37,7 +37,7 @@ <mkdir dir="${obj_dir}"/> <mkdir dir="${p_plugin.dist_dir}"/> - <javac srcdir="src" + <javac encoding="utf-8" srcdir="src" destdir="${obj_dir}" deprecation="${deprecation}" debug="${debug}" diff -Naur sql12/plugins/mysql/plugin_build.xml sql12.patched/plugins/mysql/plugin_build.xml --- sql12/plugins/mysql/plugin_build.xml 2008-12-25 21:06:38.000000000 -0500 +++ sql12.patched/plugins/mysql/plugin_build.xml 2010-01-09 11:09:15.000000000 -0500 @@ -37,7 +37,7 @@ <mkdir dir="${obj_dir}"/> <mkdir dir="${p_plugin.dist_dir}"/> - <javac srcdir="src" + <javac encoding="utf-8" srcdir="src" destdir="${obj_dir}" deprecation="${deprecation}" debug="${debug}" diff -Naur sql12/plugins/oracle/plugin_build.xml sql12.patched/plugins/oracle/plugin_build.xml --- sql12/plugins/oracle/plugin_build.xml 2008-12-25 21:06:38.000000000 -0500 +++ sql12.patched/plugins/oracle/plugin_build.xml 2010-01-09 11:09:15.000000000 -0500 @@ -37,7 +37,7 @@ <mkdir dir="${obj_dir}"/> <mkdir dir="${p_plugin.dist_dir}"/> - <javac srcdir="src" + <javac encoding="utf-8" srcdir="src" destdir="${obj_dir}" deprecation="${deprecation}" debug="${debug}" diff -Naur sql12/plugins/postgres/plugin_build.xml sql12.patched/plugins/postgres/plugin_build.xml --- sql12/plugins/postgres/plugin_build.xml 2008-12-25 21:06:36.000000000 -0500 +++ sql12.patched/plugins/postgres/plugin_build.xml 2010-01-09 11:09:15.000000000 -0500 @@ -37,7 +37,7 @@ <mkdir dir="${obj_dir}"/> <mkdir dir="${p_plugin.dist_dir}"/> - <javac srcdir="src" + <javac encoding="utf-8" srcdir="src" destdir="${obj_dir}" deprecation="${deprecation}" debug="${debug}" diff -Naur sql12/plugins/refactoring/plugin_build.xml sql12.patched/plugins/refactoring/plugin_build.xml --- sql12/plugins/refactoring/plugin_build.xml 2008-12-25 21:06:38.000000000 -0500 +++ sql12.patched/plugins/refactoring/plugin_build.xml 2010-01-09 11:09:15.000000000 -0500 @@ -46,7 +46,7 @@ <mkdir dir="${obj_dir}"/> <mkdir dir="${p_plugin.dist_dir}"/> - <javac srcdir="src" + <javac encoding="utf-8" srcdir="src" destdir="${obj_dir}" deprecation="${deprecation}" debug="${debug}" diff -Naur sql12/plugins/sessionscript/plugin_build.xml sql12.patched/plugins/sessionscript/plugin_build.xml --- sql12/plugins/sessionscript/plugin_build.xml 2008-12-25 21:06:36.000000000 -0500 +++ sql12.patched/plugins/sessionscript/plugin_build.xml 2010-01-09 11:09:15.000000000 -0500 @@ -37,7 +37,7 @@ <mkdir dir="${obj_dir}"/> <mkdir dir="${p_plugin.dist_dir}"/> - <javac srcdir="src" + <javac encoding="utf-8" srcdir="src" destdir="${obj_dir}" deprecation="${deprecation}" debug="${debug}" diff -Naur sql12/plugins/smarttools/plugin_build.xml sql12.patched/plugins/smarttools/plugin_build.xml --- sql12/plugins/smarttools/plugin_build.xml 2008-12-25 21:06:36.000000000 -0500 +++ sql12.patched/plugins/smarttools/plugin_build.xml 2010-01-09 11:09:15.000000000 -0500 @@ -37,7 +37,7 @@ <mkdir dir="${obj_dir}"/> <mkdir dir="${p_plugin.dist_dir}"/> - <javac srcdir="src" + <javac encoding="utf-8" srcdir="src" destdir="${obj_dir}" deprecation="${deprecation}" debug="${debug}" diff -Naur sql12/plugins/sqlbookmark/plugin_build.xml sql12.patched/plugins/sqlbookmark/plugin_build.xml --- sql12/plugins/sqlbookmark/plugin_build.xml 2008-12-25 21:06:38.000000000 -0500 +++ sql12.patched/plugins/sqlbookmark/plugin_build.xml 2010-01-09 11:09:15.000000000 -0500 @@ -37,7 +37,7 @@ <mkdir dir="${obj_dir}"/> <mkdir dir="${p_plugin.dist_dir}"/> - <javac srcdir="src" + <javac encoding="utf-8" srcdir="src" destdir="${obj_dir}" deprecation="${deprecation}" debug="${debug}" diff -Naur sql12/plugins/sqlparam/plugin_build.xml sql12.patched/plugins/sqlparam/plugin_build.xml --- sql12/plugins/sqlparam/plugin_build.xml 2008-12-25 21:06:36.000000000 -0500 +++ sql12.patched/plugins/sqlparam/plugin_build.xml 2010-01-09 11:09:15.000000000 -0500 @@ -38,7 +38,7 @@ <mkdir dir="${obj_dir}"/> <mkdir dir="${p_plugin.dist_dir}"/> - <javac srcdir="src" + <javac encoding="utf-8" srcdir="src" destdir="${obj_dir}" deprecation="${deprecation}" debug="${debug}" diff -Naur sql12/plugins/sqlreplace/plugin_build.xml sql12.patched/plugins/sqlreplace/plugin_build.xml --- sql12/plugins/sqlreplace/plugin_build.xml 2008-12-25 21:06:36.000000000 -0500 +++ sql12.patched/plugins/sqlreplace/plugin_build.xml 2010-01-09 11:09:15.000000000 -0500 @@ -36,7 +36,7 @@ <mkdir dir="${obj_dir}"/> <mkdir dir="${p_plugin.dist_dir}"/> - <javac srcdir="src" + <javac encoding="utf-8" srcdir="src" destdir="${obj_dir}" deprecation="${deprecation}" debug="${debug}" diff -Naur sql12/plugins/sqlscript/plugin_build.xml sql12.patched/plugins/sqlscript/plugin_build.xml --- sql12/plugins/sqlscript/plugin_build.xml 2008-12-25 21:06:36.000000000 -0500 +++ sql12.patched/plugins/sqlscript/plugin_build.xml 2010-01-09 11:09:15.000000000 -0500 @@ -37,7 +37,7 @@ <mkdir dir="${obj_dir}"/> <mkdir dir="${p_plugin.dist_dir}"/> - <javac srcdir="src" + <javac encoding="utf-8" srcdir="src" destdir="${obj_dir}" deprecation="${deprecation}" debug="${debug}" diff -Naur sql12/plugins/sqlval/build.xml sql12.patched/plugins/sqlval/build.xml --- sql12/plugins/sqlval/build.xml 2003-05-25 06:59:52.000000000 -0400 +++ sql12.patched/plugins/sqlval/build.xml 2010-01-09 11:09:15.000000000 -0500 @@ -35,7 +35,7 @@ <mkdir dir="${obj_dir}"/> <mkdir dir="${plugin_dist_dir}"/> - <javac srcdir="src" + <javac encoding="utf-8" srcdir="src" destdir="${obj_dir}" deprecation="${deprecation}" debug="${debug}" diff -Naur sql12/plugins/sqlval/plugin_build.xml sql12.patched/plugins/sqlval/plugin_build.xml --- sql12/plugins/sqlval/plugin_build.xml 2008-12-25 21:06:38.000000000 -0500 +++ sql12.patched/plugins/sqlval/plugin_build.xml 2010-01-09 11:09:15.000000000 -0500 @@ -37,7 +37,7 @@ <mkdir dir="${obj_dir}"/> <mkdir dir="${p_plugin.dist_dir}"/> - <javac srcdir="src" + <javac encoding="utf-8" srcdir="src" destdir="${obj_dir}" deprecation="${deprecation}" debug="${debug}" diff -Naur sql12/plugins/sybase/plugin_build.xml sql12.patched/plugins/sybase/plugin_build.xml --- sql12/plugins/sybase/plugin_build.xml 2008-12-25 21:06:38.000000000 -0500 +++ sql12.patched/plugins/sybase/plugin_build.xml 2010-01-09 11:09:15.000000000 -0500 @@ -37,7 +37,7 @@ <mkdir dir="${obj_dir}"/> <mkdir dir="${p_plugin.dist_dir}"/> - <javac srcdir="src" + <javac encoding="utf-8" srcdir="src" destdir="${obj_dir}" deprecation="${deprecation}" debug="${debug}" diff -Naur sql12/plugins/syntax/plugin_build.xml sql12.patched/plugins/syntax/plugin_build.xml --- sql12/plugins/syntax/plugin_build.xml 2009-02-21 16:23:48.000000000 -0500 +++ sql12.patched/plugins/syntax/plugin_build.xml 2010-01-09 11:09:15.000000000 -0500 @@ -37,7 +37,7 @@ <mkdir dir="${obj_dir}"/> <mkdir dir="${p_plugin.dist_dir}"/> - <javac srcdir="src" + <javac encoding="utf-8" srcdir="src" destdir="${obj_dir}" deprecation="${deprecation}" debug="${debug}" diff -Naur sql12/plugins/userscript/plugin_build.xml sql12.patched/plugins/userscript/plugin_build.xml --- sql12/plugins/userscript/plugin_build.xml 2008-12-25 21:06:36.000000000 -0500 +++ sql12.patched/plugins/userscript/plugin_build.xml 2010-01-09 11:09:15.000000000 -0500 @@ -37,7 +37,7 @@ <mkdir dir="${obj_dir}"/> <mkdir dir="${p_plugin.dist_dir}"/> - <javac srcdir="src" + <javac encoding="utf-8" srcdir="src" destdir="${obj_dir}" deprecation="${deprecation}" debug="${debug}" |
