From aee1b448de60da27087912affde3af0e1d60834f Mon Sep 17 00:00:00 2001
From: Andreas Kraft <an.kraft@googlemail.com>
Date: Mon, 27 Apr 2015 16:44:45 +0200
Subject: [PATCH] Fixed superflous generation of gen directory on top level
---
SDT/schema/build.xml | 7 ++++---
SDT/schema/etc/common.xml | 2 +-
SDT/schema/etc/properties.xml | 4 ++--
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/SDT/schema/build.xml b/SDT/schema/build.xml
index 8a12374..a02d389 100644
--- a/SDT/schema/build.xml
+++ b/SDT/schema/build.xml
@@ -8,7 +8,7 @@
<!-- - generate HTML documentation from DAL documents -->
<project name="importing" basedir="." default="schemas">
- <import file="../../etc/common.xml"/>
+ <import file="etc/common.xml"/>
<!-- Read the namespace declarations from a file (to get linebreaks) - - - -->
@@ -30,9 +30,10 @@
<!-- xml-apis.jar and xercesImpl.jar in the Ant lib directory. -->
<target name="html">
- <xslt basedir="${basedir}/test" destdir="${basedir}/html"
+ <mkdir dir="${path.genbase}" />
+ <xslt basedir="${basedir}/test" destdir="${basedir}/gen/html"
style="${basedir}/style/html.xsl">
- <param name="destdir" expression="${basedir}/html"/>
+ <param name="destdir" expression="${basedir}/gen/html"/>
<sysproperty
key="org.apache.xerces.xni.parser.XMLParserConfiguration"
value="org.apache.xerces.parsers.XIncludeParserConfiguration"/>
diff --git a/SDT/schema/etc/common.xml b/SDT/schema/etc/common.xml
index 87a562f..c05a65e 100644
--- a/SDT/schema/etc/common.xml
+++ b/SDT/schema/etc/common.xml
@@ -8,7 +8,7 @@
-->
-<property name="path.libs" location="${basedir}/../../libs" />
+<property name="path.libs" location="${basedir}/lib" />
<!-- Load various tasks -->
<import file="anttasks.xml" />
diff --git a/SDT/schema/etc/properties.xml b/SDT/schema/etc/properties.xml
index 33fd7df..ce8aba6 100644
--- a/SDT/schema/etc/properties.xml
+++ b/SDT/schema/etc/properties.xml
@@ -9,7 +9,7 @@
select="\1" />
<!-- A couple of constants -->
-<property name="path.base" location="${basedir}/../.." />
+<property name="path.base" location="${basedir}" />
<property name="path.libs" location="${path.base}/libs" />
<property name="path.etc" location="${path.base}/etc" />
<property name="path.genbase" location="${path.base}/gen" />
@@ -48,7 +48,7 @@
<loadproperties srcFile="properties" />
<!-- Load project specific properties from local properties file -->
- <loadproperties srcFile="../../etc/default.properties" />
+ <loadproperties srcFile="etc/default.properties" />
<!-- Set the start loglevel -->
<setloglevel level="${loglevel}" />
--
GitLab