From ecf018bd768626fcb368b470ed505971f6b00794 Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Sun, 29 Mar 2009 11:34:33 +0000
Subject: [PATCH] fix: BuildAndEnvironmentInfo independent of OSUtilities fix:
src jar is not recursive
SVN: 10420
---
base/build/build.xml | 4 ++--
.../systemsx/cisd/base/utilities/BuildAndEnvironmentInfo.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/base/build/build.xml b/base/build/build.xml
index 6aa4846b302..0ac79ae9a82 100644
--- a/base/build/build.xml
+++ b/base/build/build.xml
@@ -102,7 +102,7 @@
<target name="src-zip">
<build-info revision="revision.number" version="version.number" clean="clean.flag" />
<echo file="${build.info.file}">${version.number}:${revision.number}:${clean.flag}</echo>
- <recursive-jar destfile="${src.zip.file}">
+ <jar destfile="${src.zip.file}">
<fileset dir="${classes}">
<include name="${build.info.filename}" />
</fileset>
@@ -117,7 +117,7 @@
<attribute name="Build-Number"
value="${version.number} (r${revision.number},${clean.flag})" />
</manifest>
- </recursive-jar>
+ </jar>
</target>
<target name="doc">
diff --git a/base/source/java/ch/systemsx/cisd/base/utilities/BuildAndEnvironmentInfo.java b/base/source/java/ch/systemsx/cisd/base/utilities/BuildAndEnvironmentInfo.java
index 8873b620b1a..04c90dc4428 100644
--- a/base/source/java/ch/systemsx/cisd/base/utilities/BuildAndEnvironmentInfo.java
+++ b/base/source/java/ch/systemsx/cisd/base/utilities/BuildAndEnvironmentInfo.java
@@ -213,7 +213,7 @@ public final class BuildAndEnvironmentInfo
builder.append(environmentInfo.get(i));
if (i < n - 1)
{
- builder.append(OSUtilities.LINE_SEPARATOR);
+ builder.append(System.getProperty("line.separator"));
}
}
return builder.toString();
--
GitLab