Author: sebb
Date: Tue Sep 14 15:56:38 2010
New Revision: 996965
URL: http://svn.apache.org/viewvc?rev=996965&view=rev
Log:
Remove procrun directory from windows tree
Added:
commons/proper/daemon/trunk/src/native/windows/README.dev
- copied unchanged from r996938,
commons/proper/daemon/trunk/src/native/windows/procrun/README.dev
commons/proper/daemon/trunk/src/native/windows/apps/
- copied from r996930,
commons/proper/daemon/trunk/src/native/windows/procrun/apps/
commons/proper/daemon/trunk/src/native/windows/include/
- copied from r996930,
commons/proper/daemon/trunk/src/native/windows/procrun/include/
commons/proper/daemon/trunk/src/native/windows/resources/
- copied from r996930,
commons/proper/daemon/trunk/src/native/windows/procrun/resources/
commons/proper/daemon/trunk/src/native/windows/src/
- copied from r996930,
commons/proper/daemon/trunk/src/native/windows/procrun/src/
commons/proper/daemon/trunk/src/native/windows/xdocs/
- copied from r996930,
commons/proper/daemon/trunk/src/native/windows/procrun/xdocs/
Removed:
commons/proper/daemon/trunk/src/native/windows/procrun/README.dev
commons/proper/daemon/trunk/src/native/windows/procrun/apps/
commons/proper/daemon/trunk/src/native/windows/procrun/include/
commons/proper/daemon/trunk/src/native/windows/procrun/resources/
commons/proper/daemon/trunk/src/native/windows/procrun/src/
commons/proper/daemon/trunk/src/native/windows/procrun/xdocs/
Modified:
commons/proper/daemon/trunk/build.xml
commons/proper/daemon/trunk/src/assembly/native-src.xml
commons/proper/daemon/trunk/src/assembly/src.xml
Modified: commons/proper/daemon/trunk/build.xml
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/build.xml?rev=996965&r1=996964&r2=996965&view=diff
==============================================================================
--- commons/proper/daemon/trunk/build.xml (original)
+++ commons/proper/daemon/trunk/build.xml Tue Sep 14 15:56:38 2010
@@ -238,7 +238,7 @@
<fileset dir="src/native/unix" />
</copy>
<copy todir="${native.path}/windows">
- <fileset dir="src/native/windows/procrun" />
+ <fileset dir="src/native/windows" />
</copy>
<copy file="LICENSE.txt"
todir="${native.path}"/>
Modified: commons/proper/daemon/trunk/src/assembly/native-src.xml
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/assembly/native-src.xml?rev=996965&r1=996964&r2=996965&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/assembly/native-src.xml (original)
+++ commons/proper/daemon/trunk/src/assembly/native-src.xml Tue Sep 14 15:56:38
2010
@@ -54,7 +54,7 @@
</includes>
</fileSet>
<fileSet>
- <directory>src/native/windows/procrun</directory>
+ <directory>src/native/windows</directory>
<outputDirectory>windows</outputDirectory>
<lineEnding>crlf</lineEnding>
<excludes>
@@ -67,7 +67,7 @@
<fileMode>664</fileMode>
</fileSet>
<fileSet>
- <directory>src/native/windows/procrun</directory>
+ <directory>src/native/windows</directory>
<outputDirectory>windows</outputDirectory>
<includes>
<include>**/*.ico</include>
Modified: commons/proper/daemon/trunk/src/assembly/src.xml
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/assembly/src.xml?rev=996965&r1=996964&r2=996965&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/assembly/src.xml (original)
+++ commons/proper/daemon/trunk/src/assembly/src.xml Tue Sep 14 15:56:38 2010
@@ -48,7 +48,7 @@
<fileSet>
<directory>src</directory>
<includes>
- <include>native/windows/procrun/**</include>
+ <include>native/windows/**</include>
</includes>
</fileSet>
<fileSet>
