Merged trunk@30158, @30159, @30162, @30202, @30417 to branches/sysdyn-1.8 on 2014...

refs #5244

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/branches/1.8@30419 ac1ea38d-2e2b-0410-8846-a27921b304fc

diff --git a/org.simantics.fmu.me.win64/.classpath b/org.simantics.fmu.me.win64/.classpath
new file mode 100644 (file)
index 0000000..8a8f166
--- /dev/null
+++ b/org.simantics.fmu.me.win64/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<classpath>\r
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>\r
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
+       <classpathentry kind="src" path="src"/>\r
+       <classpathentry kind="output" path="bin"/>\r
+</classpath>\r

diff --git a/org.simantics.fmu.me.win64/.project b/org.simantics.fmu.me.win64/.project
new file mode 100644 (file)
index 0000000..738e38b
--- /dev/null
+++ b/org.simantics.fmu.me.win64/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<projectDescription>\r
+       <name>org.simantics.fmu.me.win64</name>\r
+       <comment></comment>\r
+       <projects>\r
+       </projects>\r
+       <buildSpec>\r
+               <buildCommand>\r
+                       <name>org.eclipse.jdt.core.javabuilder</name>\r
+                       <arguments>\r
+                       </arguments>\r
+               </buildCommand>\r
+               <buildCommand>\r
+                       <name>org.eclipse.pde.ManifestBuilder</name>\r
+                       <arguments>\r
+                       </arguments>\r
+               </buildCommand>\r
+               <buildCommand>\r
+                       <name>org.eclipse.pde.SchemaBuilder</name>\r
+                       <arguments>\r
+                       </arguments>\r
+               </buildCommand>\r
+       </buildSpec>\r
+       <natures>\r
+               <nature>org.eclipse.pde.PluginNature</nature>\r
+               <nature>org.eclipse.jdt.core.javanature</nature>\r
+       </natures>\r
+</projectDescription>\r

diff --git a/org.simantics.fmu.me.win64/.settings/org.eclipse.jdt.core.prefs b/org.simantics.fmu.me.win64/.settings/org.eclipse.jdt.core.prefs
new file mode 100644 (file)
index 0000000..f287d53
--- /dev/null
+++ b/org.simantics.fmu.me.win64/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1\r
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled\r
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6\r
+org.eclipse.jdt.core.compiler.compliance=1.6\r
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error\r
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\r
+org.eclipse.jdt.core.compiler.source=1.6\r

diff --git a/org.simantics.fmu.me.win64/META-INF/MANIFEST.MF b/org.simantics.fmu.me.win64/META-INF/MANIFEST.MF
new file mode 100644 (file)
index 0000000..ea48c6f
--- /dev/null
+++ b/org.simantics.fmu.me.win64/META-INF/MANIFEST.MF
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Win64 binaries for FMI model exchange
+Bundle-SymbolicName: org.simantics.fmu.me.win64
+Bundle-Version: 1.1.0.qualifier
+Bundle-Vendor: Semantum Oy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
+ org.simantics.utils;bundle-version="1.1.0"
+Eclipse-PlatformFilter: (& (osgi.ws=win32) (osgi.os=win32) (osgi.arch=x86_64))

diff --git a/org.simantics.fmu.me.win64/build.properties b/org.simantics.fmu.me.win64/build.properties
new file mode 100644 (file)
index 0000000..150031b
--- /dev/null
+++ b/org.simantics.fmu.me.win64/build.properties
@@ -0,0 +1,5 @@
+source.. = src/\r
+output.. = bin/\r
+bin.includes = META-INF/,\\r
+               .,\\r
+               libraries/\r

diff --git a/org.simantics.fmu.me.win64/libraries/FMUSimulator.dll b/org.simantics.fmu.me.win64/libraries/FMUSimulator.dll
new file mode 100644 (file)
index 0000000..4e7cdc7
Binary files /dev/null and b/org.simantics.fmu.me.win64/libraries/FMUSimulator.dll differ

diff --git a/org.simantics.fmu.me.win64/libraries/libexpat.dll b/org.simantics.fmu.me.win64/libraries/libexpat.dll
new file mode 100644 (file)
index 0000000..0f8b01b
Binary files /dev/null and b/org.simantics.fmu.me.win64/libraries/libexpat.dll differ

diff --git a/org.simantics.fmu.me.win64/libraries/miniunz.dll b/org.simantics.fmu.me.win64/libraries/miniunz.dll
new file mode 100644 (file)
index 0000000..4ad78ba
Binary files /dev/null and b/org.simantics.fmu.me.win64/libraries/miniunz.dll differ

diff --git a/org.simantics.fmu.me.win64/libraries/zlibwapi.dll b/org.simantics.fmu.me.win64/libraries/zlibwapi.dll
new file mode 100644 (file)
index 0000000..72f5e38
Binary files /dev/null and b/org.simantics.fmu.me.win64/libraries/zlibwapi.dll differ