modify maven linux settings

XinYao1994 · Dec 17, 2015 · 805a542 · 805a542
1 parent c5a358a
commit 805a542
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 16 deletions.
diff --git a/.gitignore b/.gitignore
@@ -110,6 +110,11 @@ mxnet-scala/project/plugins/project/
 scala-package/*/target/
 scala-package/*/*/target/
 
+#eclipse
+.classpath
+.project
+.settings
+
 # IDE specific
 mxnet-scala/.scala_dependencies
 mxnet-scala/.worksheet

diff --git a/scala-package/core/pom.xml b/scala-package/core/pom.xml
@@ -19,7 +19,7 @@
       </properties>
     </profile>
     <profile>
-      <id>Linux</id>
+      <id>linux-x86_64</id>
       <properties>
         <platform>linux-x86_64</platform>
       </properties>     

diff --git a/scala-package/native/linux-x86_64/pom.xml b/scala-package/native/linux-x86_64/pom.xml
@@ -72,13 +72,6 @@
             <linkerMiddleOption>-Wl,--whole-archive</linkerMiddleOption>
             <linkerMiddleOption>../../../lib/libmxnet.a</linkerMiddleOption>
             <linkerMiddleOption>-Wl,-no-whole-archive</linkerMiddleOption>
-            <!--
-            <linkerMiddleOption>
-              -pthread -lm -lblas -lrt -fopenmp
-            </linkerMiddleOption>
-            <linkerMiddleOption>-Wl,-exported_symbol,_Java_*</linkerMiddleOption>
-            <linkerMiddleOption>-Wl,-x</linkerMiddleOption>
-            -->
           </linkerMiddleOptions>
         </configuration>
 

diff --git a/scala-package/native/pom.xml b/scala-package/native/pom.xml
@@ -25,16 +25,16 @@
       </modules>
     </profile>
     <profile>
-      <id>Linux</id>
+      <id>linux-x86_64</id>
       <activation>
-        <os>
-          <family>Linux</family>
-          <arch>x64</arch>
-        </os>
+        <property>
+          <name>platform</name>
+          <value>linux-x86_64</value>
+        </property>
       </activation>
       <modules>
-            <module>linux-x86_64</module>
-    </modules>
+        <module>linux-x86_64</module>
+      </modules>
     </profile>
   </profiles>
 </project>
diff --git a/scala-package/pom.xml b/scala-package/pom.xml
@@ -122,7 +122,7 @@
                    Run in this way:
                    mvn clean package -P osx-x86_64 && mvn integration-test -P osx-x86_64
                    for linux:
-                   mvn clean package -P Linux && mvn integration-test -P Linux
+                   mvn clean package -P linux-x86_64 && mvn integration-test -P linux-x86_64
                    This is a temporary solution. -->
               <phase>integration-test</phase>
               <goals>