From 83b981d218b4806e03aac0ad2727ef5c49e1ab8c Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Mon, 2 Sep 2013 09:35:40 +0000
Subject: [PATCH] Verschiedene Verbesserungen am Build-System, unter anderem
 wird das Encoding der Source-Dateien jetzt auf UTF-8 gesetzt um Probleme bei
 Kompilieren unter Betriebssystem zu vermeiden, die nicht UTF-8 als
 Standard-Encoding verwenden, z.B. Windows.

git-svn-id: https://svn.libreccm.org/ccm/trunk@2313 8810af33-2d31-482b-a856-94f89814c4df
---
 tools-ng/common/xsl/build-template.xsl   | 2 ++
 tools-ng/ecdc/conf/build.properties      | 5 ++++-
 tools-ng/ecdc/scriptlib/build-common.xml | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/tools-ng/common/xsl/build-template.xsl b/tools-ng/common/xsl/build-template.xsl
index a13618cf4..af99ad702 100755
--- a/tools-ng/common/xsl/build-template.xsl
+++ b/tools-ng/common/xsl/build-template.xsl
@@ -2258,7 +2258,9 @@
       deprecation="${{compile.deprecation}}"
       verbose="${{compile.verbose}}"
       nowarn="${{compile.nowarn}}"
+      source="${{compile.source}}"
       target="${{compile.target}}"
+      encoding="${{compile.encoding}}"
       destdir="{$destdir}"
       classpathref="{$classpathref}">
       <src refid="{$srcpathref}"/>
diff --git a/tools-ng/ecdc/conf/build.properties b/tools-ng/ecdc/conf/build.properties
index 285a7cd17..b135fb280 100644
--- a/tools-ng/ecdc/conf/build.properties
+++ b/tools-ng/ecdc/conf/build.properties
@@ -45,10 +45,13 @@ compile.nowarn=on
 
 # Optionally specifiy version of target JVM.
 # By default the version of the build system is determined and used as target.
-#compile.target=1.6
+compile.source=1.6
+compile.target=1.6
+compile.encoding=UTF-8
 
 # These properties are specific to Jikes
 build.compiler.emacs=off
 build.compiler.pedantic=off
 build.compiler.fulldepend=off
 
+
diff --git a/tools-ng/ecdc/scriptlib/build-common.xml b/tools-ng/ecdc/scriptlib/build-common.xml
index dc0e8a1b6..cb8393890 100644
--- a/tools-ng/ecdc/scriptlib/build-common.xml
+++ b/tools-ng/ecdc/scriptlib/build-common.xml
@@ -38,7 +38,7 @@
 
     <!-- Specifies the test application server runtime managed by build-runtime.xml
          Provides app.server.*.dir props used by build-runtime and build-project -->
-    <property file="${ccm.project.dir}/local.runtime.properties" />
+    <property file="${ccm.project.dir}/local.runtime.properties.bak" />
     <property file="${ccm.ecdc.conf.dir}/runtime.properties" />
 
     <!-- Specifies the compiler & build options and the junit test environment