Author: mturk
Date: Tue Feb 7 10:29:38 2012
New Revision: 1241414
URL: http://svn.apache.org/viewvc?rev=1241414&view=rev
Log:
Add assembly descriptor for bin-windows.zip so we don't have to pack that
manualy
Added:
commons/proper/daemon/branches/1.0.x/src/main/assembly/win.xml (with
props)
Modified:
commons/proper/daemon/branches/1.0.x/pom.xml
commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunmgr/Makefile
commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/Makefile
Modified: commons/proper/daemon/branches/1.0.x/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/pom.xml?rev=1241414&r1=1241413&r2=1241414&view=diff
==============================================================================
--- commons/proper/daemon/branches/1.0.x/pom.xml (original)
+++ commons/proper/daemon/branches/1.0.x/pom.xml Tue Feb 7 10:29:38 2012
@@ -120,6 +120,7 @@
<descriptor>src/main/assembly/native-src.xml</descriptor>
<descriptor>src/main/assembly/bin.xml</descriptor>
<descriptor>src/main/assembly/src.xml</descriptor>
+ <descriptor>src/main/assembly/win.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
Added: commons/proper/daemon/branches/1.0.x/src/main/assembly/win.xml
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/main/assembly/win.xml?rev=1241414&view=auto
==============================================================================
--- commons/proper/daemon/branches/1.0.x/src/main/assembly/win.xml (added)
+++ commons/proper/daemon/branches/1.0.x/src/main/assembly/win.xml Tue Feb 7
10:29:38 2012
@@ -0,0 +1,43 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<assembly>
+ <id>bin-windows</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <baseDirectory></baseDirectory>
+ <includeSiteDirectory>false</includeSiteDirectory>
+ <fileSets>
+ <fileSet>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ <include>RELEASE-NOTES.txt</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>target</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>*.exe</include>
+ <include>amd64/*.exe</include>
+ <include>ia64/*.exe</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
+
Propchange: commons/proper/daemon/branches/1.0.x/src/main/assembly/win.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunmgr/Makefile
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunmgr/Makefile?rev=1241414&r1=1241413&r2=1241414&view=diff
==============================================================================
---
commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunmgr/Makefile
(original)
+++
commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunmgr/Makefile
Tue Feb 7 10:29:38 2012
@@ -22,12 +22,19 @@ UNICODE = 1
!include <..\..\include\Makefile.inc>
!IF !DEFINED(PREFIX) || "$(PREFIX)" == ""
-PREFIX = .\..\..\dist
+PREFIX = .\..\..\..\..\..\target
!ENDIF
!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
SRCDIR = .\..\..
!ENDIF
+!IF "$(CPU)" == "X64"
+PREFIX = $(PREFIX)\amd64
+!ENDIF
+!IF "$(CPU)" == "I64"
+PREFIX = $(PREFIX)\ia64
+!ENDIF
+
LFLAGS = $(LFLAGS) /version:1.0
LIBS = $(LIBS) user32.lib gdi32.lib winspool.lib comdlg32.lib comctl32.lib
shlwapi.lib netapi32.lib
INCLUDES = -I$(SRCDIR)\include -I$(SRCDIR)\src $(JAVA_INCLUDES)
Modified:
commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/Makefile
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/Makefile?rev=1241414&r1=1241413&r2=1241414&view=diff
==============================================================================
---
commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/Makefile
(original)
+++
commons/proper/daemon/branches/1.0.x/src/native/windows/apps/prunsrv/Makefile
Tue Feb 7 10:29:38 2012
@@ -22,7 +22,7 @@ UNICODE = 1
!include <..\..\include\Makefile.inc>
!IF !DEFINED(PREFIX) || "$(PREFIX)" == ""
-PREFIX = .\..\..\dist
+PREFIX = .\..\..\..\..\..\target
!ENDIF
!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
SRCDIR = .\..\..
@@ -32,6 +32,13 @@ SRCDIR = .\..\..
LFLAGS = $(LFLAGS) /stack:0x64000
!ENDIF
+!IF "$(CPU)" == "X64"
+PREFIX = $(PREFIX)\amd64
+!ENDIF
+!IF "$(CPU)" == "I64"
+PREFIX = $(PREFIX)\ia64
+!ENDIF
+
LFLAGS = $(LFLAGS) /version:1.0
LIBS = $(LIBS) user32.lib gdi32.lib winspool.lib comdlg32.lib comctl32.lib
shlwapi.lib netapi32.lib
INCLUDES = -I$(SRCDIR)\include -I$(SRCDIR)\src $(JAVA_INCLUDES)
