lanking520 closed pull request #11786: [MXNET-531] Add new Scala doc option
URL: https://github.com/apache/incubator-mxnet/pull/11786
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/Makefile b/Makefile
index 5816637f989..37b5e3b1905 100644
--- a/Makefile
+++ b/Makefile
@@ -584,36 +584,43 @@ rpkgtest:
scalaclean:
(cd $(ROOTDIR)/scala-package; \
- mvn clean -P$(SCALA_PKG_PROFILE),$(SCALA_VERSION_PROFILE))
+ mvn clean -P$(SCALA_PKG_PROFILE),$(SCALA_VERSION_PROFILE),full)
+
+scaladocgen:
+ (cd $(ROOTDIR)/scala-package; \
+ mvn package
-P$(SCALA_PKG_PROFILE),$(SCALA_VERSION_PROFILE),scaladocgen -Dcxx="$(CXX)" \
+ -Dcflags="$(CFLAGS)" -Dldflags="$(LDFLAGS)" \
+ -Dcurrent_libdir="$(ROOTDIR)/lib" \
+ -Dlddeps="$(LIB_DEP) $(ROOTDIR)/lib/libmxnet.a")
scalapkg:
(cd $(ROOTDIR)/scala-package; \
- mvn package -P$(SCALA_PKG_PROFILE),$(SCALA_VERSION_PROFILE)
-Dcxx="$(CXX)" \
+ mvn package
-P$(SCALA_PKG_PROFILE),$(SCALA_VERSION_PROFILE),full -Dcxx="$(CXX)" \
-Dcflags="$(CFLAGS)" -Dldflags="$(LDFLAGS)" \
-Dcurrent_libdir="$(ROOTDIR)/lib" \
-Dlddeps="$(LIB_DEP) $(ROOTDIR)/lib/libmxnet.a")
scalaunittest:
(cd $(ROOTDIR)/scala-package; \
- mvn integration-test
-P$(SCALA_PKG_PROFILE),$(SCALA_VERSION_PROFILE),unittest -Dcxx="$(CXX)" \
+ mvn integration-test
-P$(SCALA_PKG_PROFILE),$(SCALA_VERSION_PROFILE),full,unittest -Dcxx="$(CXX)" \
-Dcflags="$(CFLAGS)" -Dldflags="$(LDFLAGS)" \
-Dlddeps="$(LIB_DEP) $(ROOTDIR)/lib/libmxnet.a"
$(SCALA_TEST_ARGS))
scalaintegrationtest:
(cd $(ROOTDIR)/scala-package; \
- mvn integration-test
-P$(SCALA_PKG_PROFILE),$(SCALA_VERSION_PROFILE),integrationtest -Dcxx="$(CXX)" \
+ mvn integration-test
-P$(SCALA_PKG_PROFILE),$(SCALA_VERSION_PROFILE),full,integrationtest
-Dcxx="$(CXX)" \
-Dcflags="$(CFLAGS)" -Dldflags="$(LDFLAGS)" \
-Dlddeps="$(LIB_DEP) $(ROOTDIR)/lib/libmxnet.a"
$(SCALA_TEST_ARGS))
scalainstall:
(cd $(ROOTDIR)/scala-package; \
- mvn install -P$(SCALA_PKG_PROFILE),$(SCALA_VERSION_PROFILE)
-DskipTests -Dcxx="$(CXX)" \
+ mvn install
-P$(SCALA_PKG_PROFILE),$(SCALA_VERSION_PROFILE),full -DskipTests -Dcxx="$(CXX)"
\
-Dcflags="$(CFLAGS)" -Dldflags="$(LDFLAGS)" \
-Dlddeps="$(LIB_DEP) $(ROOTDIR)/lib/libmxnet.a")
scaladeploy:
(cd $(ROOTDIR)/scala-package; \
- mvn deploy
-Prelease,$(SCALA_PKG_PROFILE),$(SCALA_VERSION_PROFILE) -DskipTests
-Dcxx="$(CXX)" \
+ mvn deploy
-Prelease,$(SCALA_PKG_PROFILE),$(SCALA_VERSION_PROFILE),full -DskipTests
-Dcxx="$(CXX)" \
-Dcflags="$(CFLAGS)" -Dldflags="$(LDFLAGS)" \
-Dlddeps="$(LIB_DEP) $(ROOTDIR)/lib/libmxnet.a")
diff --git a/scala-package/pom.xml b/scala-package/pom.xml
index 043aaae5e9e..c8b4765490b 100644
--- a/scala-package/pom.xml
+++ b/scala-package/pom.xml
@@ -31,19 +31,30 @@
</properties>
<packaging>pom</packaging>
- <modules>
- <module>init</module>
- <module>init-native</module>
- <module>macros</module>
- <module>core</module>
- <module>native</module>
- <module>infer</module>
- <module>examples</module>
- <module>spark</module>
- <module>assembly</module>
- </modules>
<profiles>
+ <profile>
+ <id>scaladocgen</id>
+ <modules>
+ <module>init</module>
+ <module>init-native</module>
+ <module>macros</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>full</id>
+ <modules>
+ <module>init</module>
+ <module>init-native</module>
+ <module>macros</module>
+ <module>core</module>
+ <module>native</module>
+ <module>infer</module>
+ <module>examples</module>
+ <module>spark</module>
+ <module>assembly</module>
+ </modules>
+ </profile>
<profile>
<id>release</id>
<build>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
