From f2ac297252365a81fa2f2ebb43b94eba4e856bb3 Mon Sep 17 00:00:00 2001 From: "Markus F.X.J. Oberhumer" Date: Thu, 18 May 2006 08:27:19 +0200 Subject: [PATCH 1/6] Updated tags. --- .hgtags | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.hgtags b/.hgtags index 7b10e1c8..10f43e18 100644 --- a/.hgtags +++ b/.hgtags @@ -1,6 +1,10 @@ -140415ffbcef86a42b4d672249927364430d3d38 release111 +140415ffbcef86a42b4d672249927364430d3d38 RELEASE_111 223ac5b23f9731ceac9ff8d65167df4900776e36 RELEASE_190 +2c753c5bf38e7322715e2a5c6c5381111bd7a61a RELEASE_194 +2ee65b77f9117651e2e5517b2edede23698d73ca RELEASE_196 +70402aeee6e0e4fc2889658ed8cee44461c0b0a8 RELEASE_200 a935d577fc7dd9c2c87761c9c702805da6ce1e51 RELEASE_193 +b0353253b0b3d062eb5adb50d4b665a96620da45 RELEASE_195 c2e0cd4d621b047f254f2def42132a03683ff52c RELEASE_192 -eb1ce56dce7dd1835964362470610925963b9043 release110 +eb1ce56dce7dd1835964362470610925963b9043 RELEASE_110 ed96891ef795bceec6b7ff3ca1ca7764431bfb39 RELEASE_191 From 0ece50c122fdb64bcab942351c41f4b1f63976d0 Mon Sep 17 00:00:00 2001 From: "Markus F.X.J. Oberhumer" Date: Thu, 18 May 2006 09:02:00 +0200 Subject: [PATCH 2/6] Removed .cvsignore and .gitignore files. --- .cvsignore | 13 ------------- .gitignore | 13 ------------- doc/.cvsignore | 6 ------ doc/.gitignore | 6 ------ src/.cvsignore | 20 -------------------- src/.gitignore | 20 -------------------- src/stub/.cvsignore | 18 ------------------ src/stub/.gitignore | 18 ------------------ src/stub/util/armpe/.cvsignore | 1 - src/stub/util/armpe/.gitignore | 1 - src/stub/util/sstrip/.cvsignore | 4 ---- src/stub/util/sstrip/.gitignore | 4 ---- 12 files changed, 124 deletions(-) delete mode 100644 .cvsignore delete mode 100644 .gitignore delete mode 100644 doc/.cvsignore delete mode 100644 doc/.gitignore delete mode 100644 src/.cvsignore delete mode 100644 src/.gitignore delete mode 100644 src/stub/.cvsignore delete mode 100644 src/stub/.gitignore delete mode 100644 src/stub/util/armpe/.cvsignore delete mode 100644 src/stub/util/armpe/.gitignore delete mode 100644 src/stub/util/sstrip/.cvsignore delete mode 100644 src/stub/util/sstrip/.gitignore diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index df090ee5..00000000 --- a/.cvsignore +++ /dev/null @@ -1,13 +0,0 @@ -.bzr* -.darcs* -.git* -.hg* -_darcs -B -build* -doxygen -maint -ChangeLog.cvs* -GNUmakefile -MMakefile -TODO.* diff --git a/.gitignore b/.gitignore deleted file mode 100644 index df090ee5..00000000 --- a/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -.bzr* -.darcs* -.git* -.hg* -_darcs -B -build* -doxygen -maint -ChangeLog.cvs* -GNUmakefile -MMakefile -TODO.* diff --git a/doc/.cvsignore b/doc/.cvsignore deleted file mode 100644 index f6a05f85..00000000 --- a/doc/.cvsignore +++ /dev/null @@ -1,6 +0,0 @@ -upx.1 -upx.doc -upx.html -upx.man -upx.ps -upx.tex diff --git a/doc/.gitignore b/doc/.gitignore deleted file mode 100644 index f6a05f85..00000000 --- a/doc/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -upx.1 -upx.doc -upx.html -upx.man -upx.ps -upx.tex diff --git a/src/.cvsignore b/src/.cvsignore deleted file mode 100644 index 818de0be..00000000 --- a/src/.cvsignore +++ /dev/null @@ -1,20 +0,0 @@ -*.0?? -*.d -*.dat -*.idb -*.img -*.map -*.raw -*.rc -*.rel -*.res -*.pdb -*.out -*.upx -.gdbinit -GNUmakefile -MMakefile -compress_nrv.* -upx -version1*.h -version2*.h diff --git a/src/.gitignore b/src/.gitignore deleted file mode 100644 index 818de0be..00000000 --- a/src/.gitignore +++ /dev/null @@ -1,20 +0,0 @@ -*.0?? -*.d -*.dat -*.idb -*.img -*.map -*.raw -*.rc -*.rel -*.res -*.pdb -*.out -*.upx -.gdbinit -GNUmakefile -MMakefile -compress_nrv.* -upx -version1*.h -version2*.h diff --git a/src/stub/.cvsignore b/src/stub/.cvsignore deleted file mode 100644 index 4e409bab..00000000 --- a/src/stub/.cvsignore +++ /dev/null @@ -1,18 +0,0 @@ -.*-stamp -*.ah -*.asx -*.asy -*.bin -*.d -*.i -*.lst -*.map -*.o -*.out -*.tmp -GNUmakefile -MMakefile -stamp-h -stubify.exe -upxb -upxd diff --git a/src/stub/.gitignore b/src/stub/.gitignore deleted file mode 100644 index 4e409bab..00000000 --- a/src/stub/.gitignore +++ /dev/null @@ -1,18 +0,0 @@ -.*-stamp -*.ah -*.asx -*.asy -*.bin -*.d -*.i -*.lst -*.map -*.o -*.out -*.tmp -GNUmakefile -MMakefile -stamp-h -stubify.exe -upxb -upxd diff --git a/src/stub/util/armpe/.cvsignore b/src/stub/util/armpe/.cvsignore deleted file mode 100644 index daeb35b4..00000000 --- a/src/stub/util/armpe/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -armpe_tester diff --git a/src/stub/util/armpe/.gitignore b/src/stub/util/armpe/.gitignore deleted file mode 100644 index daeb35b4..00000000 --- a/src/stub/util/armpe/.gitignore +++ /dev/null @@ -1 +0,0 @@ -armpe_tester diff --git a/src/stub/util/sstrip/.cvsignore b/src/stub/util/sstrip/.cvsignore deleted file mode 100644 index 2da519ab..00000000 --- a/src/stub/util/sstrip/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -amd64-linux-sstrip -i386-linux-sstrip -sstrip -sstrip.exe diff --git a/src/stub/util/sstrip/.gitignore b/src/stub/util/sstrip/.gitignore deleted file mode 100644 index 2da519ab..00000000 --- a/src/stub/util/sstrip/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -amd64-linux-sstrip -i386-linux-sstrip -sstrip -sstrip.exe From 5d03ba7d6319740dda1095824908e2f4f00adc26 Mon Sep 17 00:00:00 2001 From: "Markus F.X.J. Oberhumer" Date: Thu, 18 May 2006 09:08:38 +0200 Subject: [PATCH 3/6] Added .hgignore. --- .hgignore | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .hgignore diff --git a/.hgignore b/.hgignore new file mode 100644 index 00000000..b5ed7032 --- /dev/null +++ b/.hgignore @@ -0,0 +1,23 @@ +syntax: regexp + +^build.* + +syntax: glob + +*.d +*.exe +*.map +*.o +*.out +*.res +*.ttp + +stub/*.ash +stub/*.asx +stub/*.asy +stub/*.bin +stub/GNUmakefile +stub/stamp-h + +stub/util/sstrip/amd64-linux-sstrip +stub/util/sstrip/i386-linux-sstrip From 8387527d2eeee20706dc163ad46f1d8edda461d0 Mon Sep 17 00:00:00 2001 From: "Markus F.X.J. Oberhumer" Date: Thu, 18 May 2006 09:37:18 +0200 Subject: [PATCH 4/6] Updated .hgignore. --- .hgignore | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/.hgignore b/.hgignore index b5ed7032..3e737641 100644 --- a/.hgignore +++ b/.hgignore @@ -4,20 +4,36 @@ syntax: regexp syntax: glob +*.a *.d +*.dll *.exe +*.lib *.map *.o *.out +*.py[cdo] +*.so *.res *.ttp +doc/*.1 +doc/*.doc +doc/*.html + +src/MMakefile +src/compress_nrv* +src/*.rc + +stub/MMakefile +stub/stamp-h stub/*.ash stub/*.asx stub/*.asy stub/*.bin -stub/GNUmakefile -stub/stamp-h + +stub/util/armpe/armpe_tester stub/util/sstrip/amd64-linux-sstrip stub/util/sstrip/i386-linux-sstrip +stub/util/sstrip/sstrip From 2d63da0660a21539ee06164580909dbbecdfc719 Mon Sep 17 00:00:00 2001 From: "Markus F.X.J. Oberhumer" Date: Thu, 18 May 2006 10:16:59 +0200 Subject: [PATCH 5/6] Support automatic ChangeLog generation. --- .hgignore | 1 + Makefile | 21 ++++----------------- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/.hgignore b/.hgignore index 3e737641..61948662 100644 --- a/.hgignore +++ b/.hgignore @@ -1,6 +1,7 @@ syntax: regexp ^build.* +^ChangeLog syntax: glob diff --git a/Makefile b/Makefile index 797f380c..d0ad5703 100644 --- a/Makefile +++ b/Makefile @@ -23,24 +23,11 @@ endif dist: distclean false - -ifneq ($(wildcard CVS/R*),) -CVS_ROOT := $(shell cat CVS/Root) -CVS_REPO := $(shell cat CVS/Repository) -endif - -cvs-info: - @echo 'CVS info: $(CVS_ROOT) $(CVS_REPO)' - -cvs-admin-ko: - cvs admin -ko . - cvs -q -z6 update -P -d - -# automatically generate ChangeLog from CVS -ChangeLog ChangeLog.cvs: - perl $(srcdir)/scripts/cvs2cl.pl --utc -f ChangeLog.cvs +# automatically generate ChangeLog from hg +ChangeLog: + hg log --style=changelog > $@ .PHONY: default all mostlyclean clean distclean maintainer-clean -.PHONY: dist cvs-info cvs-admin-ko ChangeLog ChangeLog.cvs +.PHONY: dist ChangeLog From 0a5a80b05def357934653835f6cb7b6380107e8a Mon Sep 17 00:00:00 2001 From: "Markus F.X.J. Oberhumer" Date: Thu, 18 May 2006 10:48:06 +0200 Subject: [PATCH 6/6] Updated .hgignore. --- .hgignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.hgignore b/.hgignore index 61948662..e50def2f 100644 --- a/.hgignore +++ b/.hgignore @@ -1,6 +1,6 @@ syntax: regexp -^build.* +^build ^ChangeLog syntax: glob @@ -27,11 +27,13 @@ src/compress_nrv* src/*.rc stub/MMakefile +stub/l_t_*.i stub/stamp-h stub/*.ash stub/*.asx stub/*.asy stub/*.bin +stub/*.lst stub/util/armpe/armpe_tester