ref #6539 Fix taxeditor build (temporary)

 - disable macosx build
 - remove /bin folder from source generation (a zip cannot include
itself)

diff --git a/eu.etaxonomy.taxeditor.webapp/build.properties b/eu.etaxonomy.taxeditor.webapp/build.properties
index a5a7a9f2daaf8f900ee36c5175164aacfab19b7b..a8ba0ac03626e5623a4ba08059dce7f31d6244fd 100644 (file)
--- a/eu.etaxonomy.taxeditor.webapp/build.properties
+++ b/eu.etaxonomy.taxeditor.webapp/build.properties
@@ -1,5 +1,5 @@
-source.. = src/main/java/,\           
-           src/main/resources/           
+source.. = src/main/java/,\
+           src/main/resources/
 bin.includes = META-INF/,\
                .,\
                lib/,\
@@ -8,3 +8,4 @@ bin.includes = META-INF/,\
                lib/mysql-connector-java-5.1.38.jar,\
                lib/postgresql-9.4-1206-jdbc4.jar,\
                lib/jdbc4-2.0.jar
+output.. = bin/

diff --git a/pom.xml b/pom.xml
index 93dc3194612e7a97571f8e5cea833592db02ddb7..a6e4ef896908ea7b554234ec4ddfb53de9fb6b53 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -211,11 +211,11 @@
         <version>${tycho.version}</version>
         <configuration>
           <environments>
-            <environment>
-              <os>macosx</os>
-              <ws>cocoa</ws>
-              <arch>x86_64</arch>
-            </environment>
+<!--             <environment> -->
+<!--               <os>macosx</os> -->
+<!--               <ws>cocoa</ws> -->
+<!--               <arch>x86_64</arch> -->
+<!--             </environment> -->
             <environment>
               <os>win32</os>
               <ws>win32</ws>