You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ks...@apache.org on 2016/07/08 20:57:20 UTC

servicemix git commit: [SM-3045] Building on Windows results in:

Repository: servicemix
Updated Branches:
  refs/heads/master 901872281 -> e749fce82


[SM-3045] Building on Windows results in:

[INFO] Reading assembly descriptor: src/main/descriptors/unix-bin.xml
[ERROR] OS=Windows and the assembly descriptor contains a *nix-specific root-relative-reference (starting with slash) /
[ERROR] OS=Windows and the assembly descriptor contains a *nix-specific root-relative-reference (starting with slash) /
[ERROR] OS=Windows and the assembly descriptor contains a *nix-specific root-relative-reference (starting with slash) /

Solution in common-unix-bin.xml

Replace

<outputDirectory>/</outputDirectory>

with

<outputDirectory>${file.separator}</outputDirectory>

(Closes #48)


Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/e749fce8
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/e749fce8
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/e749fce8

Branch: refs/heads/master
Commit: e749fce82c2fe9b10c0ae6d0bc8cc4d323d0d162
Parents: 9018722
Author: Maurice <ma...@betzel.net>
Authored: Thu Jul 7 09:49:34 2016 +0200
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Fri Jul 8 22:56:35 2016 +0200

----------------------------------------------------------------------
 .../apache-servicemix/src/main/resources/common-unix-bin.xml   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/servicemix/blob/e749fce8/assemblies/apache-servicemix/src/main/resources/common-unix-bin.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/src/main/resources/common-unix-bin.xml b/assemblies/apache-servicemix/src/main/resources/common-unix-bin.xml
index eb9d685..ef98591 100644
--- a/assemblies/apache-servicemix/src/main/resources/common-unix-bin.xml
+++ b/assemblies/apache-servicemix/src/main/resources/common-unix-bin.xml
@@ -20,7 +20,7 @@
         <!-- Cherry-pick files from the expanded Karaf distribution -->
         <fileSet>
             <directory>${project.build.directory}/assembly</directory>
-            <outputDirectory>/</outputDirectory>
+            <outputDirectory>${file.separator}</outputDirectory>
             <excludes>
                 <exclude>bin/**</exclude>
                 <exclude>setenv-*</exclude>
@@ -33,7 +33,7 @@
         <!-- Copy over bin/* scripts separately to get the correct file mode -->
         <fileSet>
             <directory>${project.build.directory}/assembly</directory>
-            <outputDirectory>/</outputDirectory>
+            <outputDirectory>${file.separator}</outputDirectory>
             <includes>
                 <include>bin/*</include>
             </includes>
@@ -42,7 +42,7 @@
         </fileSet>
         <fileSet>
             <directory>${project.build.directory}/assembly</directory>
-            <outputDirectory>/</outputDirectory>
+            <outputDirectory>${file.separator}</outputDirectory>
             <includes>
                 <include>bin/*</include>
             </includes>