Skip to content

Commit

Permalink
[ENGOPS-1695] updates to EULA wrapping in subfloor
Browse files Browse the repository at this point in the history
  • Loading branch information
Steve Maring committed Feb 2, 2016
1 parent 6d88184 commit e5eaeaf
Show file tree
Hide file tree
Showing 3 changed files with 455 additions and 85 deletions.
3 changes: 3 additions & 0 deletions build.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,6 @@ dependency.oss-licenses.revision=6.1-SNAPSHOT
# Uncomment to skip the test suite run.
# mondrian.tests.skip=true
publish.generatePom=true

izpack.version=5.0.6
pentaho-eula-wrap-config.version=1.0.8
87 changes: 2 additions & 85 deletions build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ demo/FoodMartCreateData.sql"/>
Now import subfloor. All properties must be overridden first
=================================================================== -->
<import file="subfloor.xml" />
<import file="subfloor-pkg.xml" />


<!-- Define some classpaths -->
Expand Down Expand Up @@ -1237,91 +1238,7 @@ diagrams and hyperlinks to source code">
<ivy:resolve file="workbench/${ivyfile}" conf="${ivy.configs}" />
<ivy:report xml="true" todir="${ivy.reports.dir}" />
</target>

<!-- ======================================== EULA assembly packaging ========================================= -->

<target name="package-eula">

<property name="pentaho.resolve.repo" value="http://nexus.pentaho.org:8081/content/groups/omni" />

<get
src="${pentaho.resolve.repo}/ant-contrib/ant-contrib/1.0b3/ant-contrib-1.0b3.jar"
dest="dist/ant-contrib-1.0b3.jar"
verbose="true"
/>
<taskdef resource="net/sf/antcontrib/antlib.xml" classpath="dist/ant-contrib-1.0b3.jar" />

<condition property="isWindows">
<os family="windows" />
</condition>

<if>
<not>
<isset property="pentaho-eula-assembly-pom.version"/>
</not>
<then>
<property name="pentaho-eula-assembly-pom.version" value="1.0.13" />
<echo>pentaho-eula-assembly-pom.version not set, assuming default of ${pentaho-eula-assembly-pom.version}</echo>
</then>
</if>

<if>
<not>
<isset property="artifactName"/>
</not>
<then>
<property name="artifactName" value="${package.basename}" />
<echo>artifactName not set, assuming default of ${artifactName}</echo>
</then>
</if>

<if>
<not>
<available file="dist/pentaho-eula-assembly-pom-${pentaho-eula-assembly-pom.version}-pom.xml" type="file" />
</not>
<then>
<get src="${pentaho.resolve.repo}/com/pentaho/pentaho-eula-assembly-pom/${pentaho-eula-assembly-pom.version}/pentaho-eula-assembly-pom-${pentaho-eula-assembly-pom.version}-pom.xml"
dest="dist/pentaho-eula-assembly-pom-${pentaho-eula-assembly-pom.version}-pom.xml"
verbose="true" />
</then>
</if>

<echo>
mvn
-f dist/pentaho-eula-assembly-pom-${pentaho-eula-assembly-pom.version}-pom.xml
-DartifactName=${artifactName}
-Ddist.dir=
package
</echo>
<if>
<isset property="isWindows" />
<then>
<exec executable="cmd">
<arg value="/c" />
<arg value="mvn.bat" />
<arg value="-f" />
<arg value="dist/pentaho-eula-assembly-pom-${pentaho-eula-assembly-pom.version}-pom.xml" />
<arg value="-DartifactName=${artifactName}" />
<arg value="-Ddist.dir=" />
<arg value="package" />
</exec>
</then>
<else>
<exec executable="mvn">
<arg value="-f" />
<arg value="dist/pentaho-eula-assembly-pom-${pentaho-eula-assembly-pom.version}-pom.xml" />
<arg value="-DartifactName=${artifactName}" />
<arg value="-Ddist.dir=" />
<arg value="package" />
</exec>
</else>
</if>

<delete file="dist/ant-contrib-1.0b3.jar" />

</target>



</project>

<!-- End build.xml -->
Loading

0 comments on commit e5eaeaf

Please sign in to comment.