You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2010/10/05 17:56:31 UTC
svn commit: r1004690 - in /directory/studio/trunk: helps/help-plugin-pom.xml
tools/Windows Installer/windows_installer.nsi
Author: pamarcelot
Date: Tue Oct 5 15:56:31 2010
New Revision: 1004690
URL: http://svn.apache.org/viewvc?rev=1004690&view=rev
Log:
Changed the configuration of the antrun maven plugin to use 'target' instead of 'tasks' which is now deprecated.
Modified:
directory/studio/trunk/helps/help-plugin-pom.xml
directory/studio/trunk/tools/Windows Installer/windows_installer.nsi
Modified: directory/studio/trunk/helps/help-plugin-pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/helps/help-plugin-pom.xml?rev=1004690&r1=1004689&r2=1004690&view=diff
==============================================================================
--- directory/studio/trunk/helps/help-plugin-pom.xml (original)
+++ directory/studio/trunk/helps/help-plugin-pom.xml Tue Oct 5 15:56:31 2010
@@ -72,7 +72,7 @@
<id>build-pdf-html-help</id>
<phase>compile</phase>
<configuration>
- <tasks>
+ <target>
<taskdef name="fop" classname="org.apache.fop.tools.anttasks.Fop">
<classpath>
<path refid="maven.compile.classpath" />
@@ -153,7 +153,7 @@
<copy todir="../target/userguides/${name}">
<fileset dir="target/html" />
</copy>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
@@ -286,7 +286,7 @@
<id>build-eclipse-help</id>
<phase>process-classes</phase>
<configuration>
- <tasks>
+ <target>
<!-- Prepare docbook -->
<property name="fromregexpxml" value="^(docbook-xml-[^/]+)/(.*)" />
<property name="toregexpxml" value="docbook-xml/\2" />
@@ -339,7 +339,7 @@
to use our own.
-->
<copy todir="target/classes" file="plugin.xml" overwrite="true" />
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
Modified: directory/studio/trunk/tools/Windows Installer/windows_installer.nsi
URL: http://svn.apache.org/viewvc/directory/studio/trunk/tools/Windows%20Installer/windows_installer.nsi?rev=1004690&r1=1004689&r2=1004690&view=diff
==============================================================================
--- directory/studio/trunk/tools/Windows Installer/windows_installer.nsi (original)
+++ directory/studio/trunk/tools/Windows Installer/windows_installer.nsi Tue Oct 5 15:56:31 2010
@@ -229,4 +229,5 @@
# Removing registry keys
DeleteRegKey "${INSTDIR_REG_ROOT}" "${INSTDIR_REG_KEY}"
+ DeleteRegKey "${INSTDIR_REG_ROOT}" "SOFTWARE\${Application}" "InstallDir"
SectionEnd