You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ma...@apache.org on 2019/09/30 12:45:39 UTC

[commons-daemon] branch master updated (1d0243e -> 5a499d7)

This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-daemon.git.


    from 1d0243e  Fix possible unsafe code warnings reported with VS 2017
     new dd52bda  Update source distribution contents
     new 5a499d7  Update release instructions

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 HOWTO-RELEASE.txt           | 19 ++++++++++++-------
 src/assembly/native-src.xml |  1 +
 src/assembly/src.xml        |  9 ++++++---
 3 files changed, 19 insertions(+), 10 deletions(-)


[commons-daemon] 02/02: Update release instructions

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-daemon.git

commit 5a499d79537514807d08e5b59e229c5249d85eb1
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Sep 30 13:45:24 2019 +0100

    Update release instructions
---
 HOWTO-RELEASE.txt | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/HOWTO-RELEASE.txt b/HOWTO-RELEASE.txt
index 34fe917..376fa48 100644
--- a/HOWTO-RELEASE.txt
+++ b/HOWTO-RELEASE.txt
@@ -27,6 +27,7 @@ Use Java 7.
 
 If you haven't already, add your public PGP key to KEYS.
 
+
 Update version numbers as needed
 --------------------------------
 
@@ -53,6 +54,10 @@ Only in tag:
 Search for the text "THIS FILE IS GENERATED BY" and regenerate the generated
 files.
 
+
+Checkout
+--------
+
 Check out a clean copy of commons daemon from git to make sure you don't have
 any lingering configure or build files. This will make sure that the source
 distribution created is clean.
@@ -62,18 +67,15 @@ https://gitbox.apache.org/repos/asf/commons-daemon.git
 to a directory named daemon. All further path names will be relative to this
 directory.
 
+If building from an existing checkout, clean the build directories:
+mvn clean
+
+
 Create native build scripts
 ---------------------------
 
 cd /src/native/unix
 sh support/buildconf.sh
-rm -rf autom4te.cache
-
-
-Clean the build directories
----------------------------
-
-mvn clean
 
 
 Native build
@@ -85,6 +87,9 @@ target/prunsrv.exe
 target/prunmgr.exe
 target/amd64/prunsrv.exe
 
+Note: `nmake -f Makefile install` will place these files in the correct
+      locations but they will be unsigned
+
 
 Maven tasks
 -----------


[commons-daemon] 01/02: Update source distribution contents

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-daemon.git

commit dd52bda7a148a8e04c386ab1ac4d260e466fed28
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Sep 30 13:42:59 2019 +0100

    Update source distribution contents
    
    The list of files included from the root of the source tree had not been
    updated. Removed Ant related files and added new files.
    
    Exclude the working directories used by the Windows builds from the
    source distributions.
---
 src/assembly/native-src.xml | 1 +
 src/assembly/src.xml        | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/assembly/native-src.xml b/src/assembly/native-src.xml
index 133e0b2..0523e56 100644
--- a/src/assembly/native-src.xml
+++ b/src/assembly/native-src.xml
@@ -61,6 +61,7 @@
                 <exclude>**/*.ico</exclude>
                 <exclude>**/*.bmp</exclude>
                 <exclude>**/*.rc</exclude>
+                <exclude>apps/*/*_RELEASE/**</exclude>
                 <!-- Bug http://jira.codehaus.org/browse/MASSEMBLY-462 -->
                 <exclude>**/*.formatted</exclude>
             </excludes>
diff --git a/src/assembly/src.xml b/src/assembly/src.xml
index e6be6f5..e3e6eb6 100644
--- a/src/assembly/src.xml
+++ b/src/assembly/src.xml
@@ -24,13 +24,13 @@
     <fileSets>
         <fileSet>
             <includes>
-                <include>build.properties.sample</include>
-                <include>build.xml</include>
+                <include>CONTRIBUTING.md</include>
+                <include>HOWTO-RELEASE.txt</include>
                 <include>LICENSE.txt</include>
                 <include>NOTICE.txt</include>
                 <include>pom.xml</include>
                 <include>PROPOSAL.html</include>
-                <include>README</include>
+                <include>README.md</include>
                 <include>RELEASE-NOTES.txt</include>
             </includes>
         </fileSet>
@@ -52,6 +52,9 @@
             <includes>
                 <include>native/windows/**</include>
             </includes>
+            <excludes>
+                <exclude>apps/*/*_RELEASE/**</exclude>
+            </excludes>
         </fileSet>
         <fileSet>
             <directory>src</directory>