You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by ms...@apache.org on 2016/12/16 14:57:03 UTC
[1/2] portals-pluto git commit: Modified the build process so that
the inclusion / exclusion of the V3 demos is controlled by a profile named
'excludeDemos'. If this profile is present when maven builds the project, the
demos will be excluded; otherwise
Repository: portals-pluto
Updated Branches:
refs/heads/master b63360884 -> 1360d1dbe
Modified the build process so that the inclusion / exclusion of the V3 demos
is controlled by a profile named 'excludeDemos'. If this profile is present
when maven builds the project, the demos will be excluded; otherwise they
will be included. This change was necessary in order to avoid passing angle
brackets as property values on the command line. Adapted dist-build.xml ant
file to activate the profile accordingly.
Project: http://git-wip-us.apache.org/repos/asf/portals-pluto/repo
Commit: http://git-wip-us.apache.org/repos/asf/portals-pluto/commit/ba28d7ee
Tree: http://git-wip-us.apache.org/repos/asf/portals-pluto/tree/ba28d7ee
Diff: http://git-wip-us.apache.org/repos/asf/portals-pluto/diff/ba28d7ee
Branch: refs/heads/master
Commit: ba28d7ee90678c37e11de76c915a90733a650bb7
Parents: b633608
Author: Scott Nicklous <ms...@apache.org>
Authored: Fri Dec 16 14:20:33 2016 +0100
Committer: Scott Nicklous <ms...@apache.org>
Committed: Fri Dec 16 14:20:33 2016 +0100
----------------------------------------------------------------------
dist-build.xml | 7 +++----
pom.xml | 14 ++++++++++++++
2 files changed, 17 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/ba28d7ee/dist-build.xml
----------------------------------------------------------------------
diff --git a/dist-build.xml b/dist-build.xml
index 8b20da3..1390e1c 100644
--- a/dist-build.xml
+++ b/dist-build.xml
@@ -228,15 +228,14 @@
</condition>
<target name="run-maven-exclude-demos" if="installNoDemos" description="Runs the install goal and excludes the demos from pluto-portal-driver-config.xml">
- <exec executable="mvn" vmlauncher="false" dir="${basedir}" failonerror="true" os="Mac OS X">
- <arg line="install -Ppluto -DincludeDemosBegin=<!-- -DincludeDemosEnd=-->"/>
+ <exec executable="mvn" vmlauncher="false" dir="${basedir}" failonerror="true">
+ <arg line="install -Ppluto,excludeDemos -DskipTests=true"/>
</exec>
- <exec executable="dist-exclude-demos.bat" vmlauncher="false" dir="${basedir}" failonerror="true" os="Windows 7" />
</target>
<target name="run-maven-include-demos" if="installDemos" description="Runs the install goal and includes the demos in pluto-portal-driver-config.xml">
<exec executable="mvn" vmlauncher="false" dir="${basedir}" failonerror="true">
- <arg line="install -Ppluto -DskipTests=true -DincludeDemosBegin= -DincludeDemosEnd="/>
+ <arg line="install -Ppluto -DskipTests=true"/>
</exec>
</target>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/ba28d7ee/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 358aa75..8c205ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -321,6 +321,11 @@ TODO: Check if we need all of them. -->
<!-- scope of certain dependencies is "compile" for deployment on tomcat,
but "provided" for deployment on tomee. See tomee profile. -->
<dependency.scope>compile</dependency.scope>
+
+ <!-- following properties control whether or not demos are included in page
+ config file (see profile 'excludeDemos' below) -->
+ <includeDemosBegin></includeDemosBegin>
+ <includeDemosEnd></includeDemosEnd>
</properties>
<dependencyManagement>
@@ -723,6 +728,15 @@ TODO: Check if we need all of them. -->
<dependency.scope>provided</dependency.scope>
</properties>
</profile>
+
+ <!-- Build Pluto for deployment without the demos -->
+ <profile>
+ <id>excludeDemos</id>
+ <properties>
+ <includeDemosBegin><!--</includeDemosBegin>
+ <includeDemosEnd>--></includeDemosEnd>
+ </properties>
+ </profile>
</profiles>
[2/2] portals-pluto git commit: Added activation by property to
excludeDemos profile
Posted by ms...@apache.org.
Added activation by property to excludeDemos profile
Project: http://git-wip-us.apache.org/repos/asf/portals-pluto/repo
Commit: http://git-wip-us.apache.org/repos/asf/portals-pluto/commit/1360d1db
Tree: http://git-wip-us.apache.org/repos/asf/portals-pluto/tree/1360d1db
Diff: http://git-wip-us.apache.org/repos/asf/portals-pluto/diff/1360d1db
Branch: refs/heads/master
Commit: 1360d1dbee864d6dc8e6f9bcb6efd459693d82e0
Parents: ba28d7e
Author: Scott Nicklous <ms...@apache.org>
Authored: Fri Dec 16 15:02:38 2016 +0100
Committer: Scott Nicklous <ms...@apache.org>
Committed: Fri Dec 16 15:02:38 2016 +0100
----------------------------------------------------------------------
pom.xml | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/1360d1db/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8c205ff..5a68b9a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -732,6 +732,11 @@ TODO: Check if we need all of them. -->
<!-- Build Pluto for deployment without the demos -->
<profile>
<id>excludeDemos</id>
+ <activation>
+ <property>
+ <name>excludeDemos</name>
+ </property>
+ </activation>
<properties>
<includeDemosBegin><!--</includeDemosBegin>
<includeDemosEnd>--></includeDemosEnd>