From ad8d06d08e3509cc6f55266c9fcfb4287a290ffb Mon Sep 17 00:00:00 2001
From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Thu, 10 Aug 2017 13:35:14 +0300
Subject: [PATCH] Fixed mvn package and verify to also work with linux (+mac?)

Added settings.xml file to root that contains credentials for Maven
to download the Simantics maven graph-compiler plugin.

refs #7358
---
 README.md                                     |  9 ++++++
 bundles/org.simantics.editors.win32/pom.xml   | 31 +++++++++++++++++++
 .../org.simantics.tycho.configuration/pom.xml |  4 ---
 settings.xml                                  | 13 ++++++++
 4 files changed, 53 insertions(+), 4 deletions(-)
 create mode 100644 README.md
 create mode 100644 bundles/org.simantics.editors.win32/pom.xml
 create mode 100644 settings.xml

diff --git a/README.md b/README.md
new file mode 100644
index 000000000..d0d9155e4
--- /dev/null
+++ b/README.md
@@ -0,0 +1,9 @@
+To build the platform, run:
+mvn -s settings.xml package
+
+or to run unit tests as well:
+mvn -s settings.xml verify
+
+If you're building the platform inside Eclipse IDE, remember to give
+the settings.xml file to the Maven / User Settings preference page
+User Settings field.
diff --git a/bundles/org.simantics.editors.win32/pom.xml b/bundles/org.simantics.editors.win32/pom.xml
new file mode 100644
index 000000000..d987eeb7a
--- /dev/null
+++ b/bundles/org.simantics.editors.win32/pom.xml
@@ -0,0 +1,31 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+        <modelVersion>4.0.0</modelVersion>
+        <artifactId>org.simantics.editors.win32</artifactId>
+        <packaging>eclipse-plugin</packaging>
+        <version>1.0.0-SNAPSHOT</version>
+
+        <parent>
+                <groupId>org.simantics</groupId>
+                <artifactId>org.simantics.root.bundles</artifactId>
+                <version>1.0.0-SNAPSHOT</version>
+                <relativePath>..</relativePath>
+        </parent>
+
+        <build>
+                <plugins>
+                        <plugin>
+                                <groupId>org.eclipse.tycho</groupId>
+                                <artifactId>target-platform-configuration</artifactId>
+                                <configuration>
+                                        <environments>
+                                                <environment>
+                                                        <os>win32</os>
+                                                </environment>
+                                        </environments>
+                                </configuration>
+                        </plugin>
+                </plugins>
+        </build>
+
+</project>
diff --git a/releng/org.simantics.tycho.configuration/pom.xml b/releng/org.simantics.tycho.configuration/pom.xml
index 66070b623..86c4ce44d 100644
--- a/releng/org.simantics.tycho.configuration/pom.xml
+++ b/releng/org.simantics.tycho.configuration/pom.xml
@@ -66,7 +66,6 @@
 						</artifact>
 					</target>
 					<environments>
-<!--
 						<environment>
 							<os>linux</os>
 							<ws>gtk</ws>
@@ -77,7 +76,6 @@
 							<ws>gtk</ws>
 							<arch>x86_64</arch>
 						</environment>
--->
 						<environment>
 							<os>win32</os>
 							<ws>win32</ws>
@@ -88,13 +86,11 @@
 							<ws>win32</ws>
 							<arch>x86_64</arch>
 						</environment>
-<!--
 						<environment>
 							<os>macosx</os>
 							<ws>cocoa</ws>
 							<arch>x86_64</arch>
 						</environment>
--->
 					</environments>
 				</configuration>
 			</plugin>
diff --git a/settings.xml b/settings.xml
new file mode 100644
index 000000000..1aabd4d98
--- /dev/null
+++ b/settings.xml
@@ -0,0 +1,13 @@
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+                      http://maven.apache.org/xsd/settings-1.0.0.xsd">
+  <servers>
+    <server>
+      <id>graph-builder-snapshot</id>
+      <username>graph-builder</username>
+      <password>graph-builder</password>
+    </server>
+  </servers>
+</settings>
+
-- 
2.47.1