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 14:03:08 UTC
[commons-daemon] branch master updated: Merge .gitignore files into
a single file
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
The following commit(s) were added to refs/heads/master by this push:
new 08c3dba Merge .gitignore files into a single file
08c3dba is described below
commit 08c3dba5166ef355609e397ed8c1d7f91ab468c6
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Sep 30 14:52:55 2019 +0100
Merge .gitignore files into a single file
Use alphabetical order and a single file to make it east to keep aligned
with assembly configuration files.
---
.gitignore | 11 ++++++++---
src/native/unix/native/.gitignore | 3 ---
src/native/windows/apps/prunmgr/.gitignore | 2 --
src/native/windows/apps/prunsrv/.gitignore | 2 --
4 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/.gitignore b/.gitignore
index a7dd31b..96d43cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,12 +2,17 @@
/.settings/
/.classpath
/.project
+/src/native/unix/Makedefs
+/src/native/unix/Makefile
/src/native/unix/autom4te.cache/
/src/native/unix/config.log
/src/native/unix/config.nice
-/src/native/unix/configure
-/src/native/unix/Makedefs
/src/native/unix/config.status
-/src/native/unix/Makefile
+/src/native/unix/configure
/src/native/unix/jsvc
+/src/native/unix/native/*.o
+/src/native/unix/native/Makefile
+/src/native/unix/native/libservice.a
+/src/native/windows/apps/prunmgr/*_GUI_RELEASE
+/src/native/windows/apps/prunsrv/*_RELEASE
/target/
diff --git a/src/native/unix/native/.gitignore b/src/native/unix/native/.gitignore
deleted file mode 100644
index e492468..0000000
--- a/src/native/unix/native/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/Makefile
-/*.o
-/libservice.a
diff --git a/src/native/windows/apps/prunmgr/.gitignore b/src/native/windows/apps/prunmgr/.gitignore
deleted file mode 100644
index 2a24345..0000000
--- a/src/native/windows/apps/prunmgr/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/WINXP_X86_GUI_RELEASE/
-/WINXP_X64_GUI_RELEASE/
diff --git a/src/native/windows/apps/prunsrv/.gitignore b/src/native/windows/apps/prunsrv/.gitignore
deleted file mode 100644
index d7898b3..0000000
--- a/src/native/windows/apps/prunsrv/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/WINXP_X64_EXE_RELEASE/
-/WINXP_X86_EXE_RELEASE/