[Monotone-commits-diffs] net.venge.monotone.source-tree-cleanup: 7ae1c4c769494502007d3d178c7db42290b8ee5d

[code]

revision:            7ae1c4c769494502007d3d178c7db42290b8ee5d
date:                2010-12-30T23:35:49
author:              address@hidden
branch:              net.venge.monotone.source-tree-cleanup
changelog:           disapproval of revision 
'9099129e9c6094aaa797138f317dc930f16cedd8'
manifest:
format_version "1"

new_manifest [817eed98b936a29474a8d3773e685769cf5652aa]

old_revision [9099129e9c6094aaa797138f317dc930f16cedd8]

patch ".mtn-ignore"
 from [a0a936de20614bda0e4ebd6d09548d2b9127b9b7]
   to [d4e7d97ed47e8739db7f7292b8e176615623a204]

patch "Makefile.am"
 from [bbd0c9c8afa768a581670c0e453c1c1358999c90]
   to [a82e2b163643b509496a79129231ceb3e0a1193a]
============================================================
--- Makefile.am	bbd0c9c8afa768a581670c0e453c1c1358999c90
+++ Makefile.am	a82e2b163643b509496a79129231ceb3e0a1193a
@@ -215,14 +215,14 @@ UNIT_TEST_SUPPORT =						\
 
 # primaries
 
-bin_PROGRAMS = src/mtn
-noinst_PROGRAMS = util/txt2c
+bin_PROGRAMS = mtn
+noinst_PROGRAMS = txt2c
 EXTRA_PROGRAMS =
 
-bin_SCRIPTS = src/util/mtnopt
+bin_SCRIPTS = mtnopt
 
-src_mtn_SOURCES = $(MOST_SOURCES) src/monotone.cc
-nodist_src_mtn_SOURCES = src/std_hooks.cc src/schema.cc
+mtn_SOURCES = $(MOST_SOURCES) src/monotone.cc
+nodist_mtn_SOURCES = src/std_hooks.cc src/schema.cc
 
 test_bin_unit_tester_SOURCES = $(UNIT_TESTERS) $(UNIT_TESTERS_PRIV) \
 	$(UNIT_TESTEES) $(UNIT_TEST_SUPPORT)
@@ -232,7 +232,7 @@ nodist_test_bin_tester_SOURCES = test/sr
 	src/specialized_lexical_cast.cc
 nodist_test_bin_tester_SOURCES = test/src/testlib.cc
 
-util_txt2c_SOURCES = util/txt2c.cc
+txt2c_SOURCES = util/txt2c.cc
 
 noinst_LIBRARIES = src/libplatform.a src/lib3rdparty.a
 src_libplatform_a_SOURCES = src/platform.hh
@@ -292,14 +292,14 @@ if WIN32_PLATFORM
 
 if WIN32_PLATFORM
   src_libplatform_a_SOURCES += $(WIN32_PLATFORM_SOURCES)
-  src_mtn_SOURCES += src/win32/main.cc
+  mtn_SOURCES += src/win32/main.cc
   test_bin_tester_SOURCES += test/src/win32/tester-plaf.cc
   test_bin_check_net_SOURCES = test/src/win32/tester-check-net.cc
   AM_CPPFLAGS += -DWIN32
   LDADD += -lshfolder -lws2_32 -liconv -liphlpapi
 else
   src_libplatform_a_SOURCES += $(UNIX_PLATFORM_SOURCES)
-  src_mtn_SOURCES += src/unix/main.cc
+  mtn_SOURCES += src/unix/main.cc
   test_bin_tester_SOURCES += test/src/unix/tester-plaf.cc
   test_bin_check_net_SOURCES = test/src/unix/tester-check-net.cc
 endif
@@ -515,17 +515,17 @@ address@hidden@
 # build win32 installer using INNO setup
 address@hidden@
 
-win32-installer: monotone-$(PACKAGE_VERSION)-setup$(EXEEXT)
+win32-installer: monotone-$(PACKAGE_VERSION)-setup.exe
 
-monotone-$(PACKAGE_VERSION)-setup$(EXEEXT): src/mtn-stripped$(EXEEXT) html info $(ALL_GMOFILES) linguas.iss dlls.iss monotone.iss
+monotone-$(PACKAGE_VERSION)-setup.exe: mtn-stripped.exe html info $(ALL_GMOFILES) linguas.iss dlls.iss monotone.iss
 	$(ISCC) monotone.iss
 
-src/mtn-stripped$(EXEEXT): src/mtn$(EXEEXT)
+mtn-stripped.exe: mtn.exe
 	strip $< -o $@
 
-dlls.iss: src/mtn-stripped$(EXEEXT) ${top_srcdir}/Makefile.am
+dlls.iss: mtn-stripped.exe ${top_srcdir}/Makefile.am
 	rm -f $@
-	for DLL in $$( ${top_srcdir}/src/win32/dlls.sh src/mtn-stripped$(EXEEXT) | xargs cmd //c echo) ; do \
+	for DLL in $$( ${top_srcdir}/src/win32/dlls.sh mtn-stripped.exe | xargs cmd //c echo) ; do \
 	    echo "Source: \"$$DLL\"; DestDir: \"{app}\"" >> $@ ; \
 	done
 
@@ -604,7 +604,7 @@ test/func.status : mtn$(EXEEXT) test/bin
 
 # Creates the needed artifacts for manual test execution
 .PHONY: testers
-testers: src/mtn$(EXEEXT) test/bin/tester$(EXEEXT) test/bin/unit_tester$(EXEEXT) \
+testers: mtn$(EXEEXT) test/bin/tester$(EXEEXT) test/bin/unit_tester$(EXEEXT) \
 	test/bin/check_net$(EXEEXT) run_tester_tests run_func_tests run_unit_tests
 
 check_PROGRAMS = test/bin/unit_tester test/bin/tester test/bin/check_net
@@ -676,7 +676,7 @@ do_subst = sed -e 's,address@hidden
 # Support for scripts
 do_subst = sed -e 's,address@hidden@],$(PACKAGE_VERSION),'
 
-src/util/%: src/util/%.in
+%: src/util/%.in
 	$(V_subst)$(do_subst) < $< > $@ && chmod +x $@
 
 # This is phony, so that we always try to rebuild it.  If it succeeds
@@ -688,8 +688,8 @@ src/package_revision_raw.txt:
 # successfully; the rm -f ensures both
 src/package_revision_raw.txt:
 	$(AM_V_GEN)REAL_BLDDIR=$$PWD/$(top_builddir); \
-	(cd $(srcdir) && $$REAL_BLDDIR/src/mtn --root=. automate get_base_revision_id) 2>/dev/null >$@ \
-	|| (cd $(srcdir) && src/mtn --root=. automate get_base_revision_id) 2>/dev/null >$@ \
+	(cd $(srcdir) && $$REAL_BLDDIR/mtn --root=. automate get_base_revision_id) 2>/dev/null >$@ \
+	|| (cd $(srcdir) && mtn --root=. automate get_base_revision_id) 2>/dev/null >$@ \
 	|| rm -f $@
 src/package_revision.txt: src/package_revision_raw.txt
 	$(AM_V_GEN)set -e; if [ -f $< ]; then \
@@ -713,8 +713,8 @@ src/package_full_revision_raw.txt:
 .PHONY: src/package_full_revision_raw.txt
 src/package_full_revision_raw.txt:
 	$(AM_V_GEN)REAL_BLDDIR=$$PWD/$(top_builddir); \
-	(cd $(srcdir) && $$REAL_BLDDIR/src/mtn --root=. automate get_current_revision) 2>/dev/null >$@ \
-	|| (cd $(srcdir) && src/mtn --root=. automate get_current_revision) 2>/dev/null >$@ \
+	(cd $(srcdir) && $$REAL_BLDDIR/mtn --root=. automate get_current_revision) 2>/dev/null >$@ \
+	|| (cd $(srcdir) && mtn --root=. automate get_current_revision) 2>/dev/null >$@ \
 	|| rm -f $@
 # See above comment -- the file this depends on may or may not exist.
 # This file, however, must always exist, so that 'make dist' can
@@ -795,9 +795,9 @@ html: monotone.texi version.texi src/std
 		rm -f $$f.bak; \
 	done
 
-mtn.1: src/mtn$(EXEEXT)
+mtn.1: mtn$(EXEEXT)
 	$(AM_V_GEN)REAL_BLDDIR=$$PWD/$(top_builddir); \
-	(cd $(srcdir) && $$REAL_BLDDIR/src/mtn manpage --norc) 2>/dev/null >$@ || rm -f $@
+	(cd $(srcdir) && $$REAL_BLDDIR/mtn manpage --norc) 2>/dev/null >$@ || rm -f $@
 
 # Verbosity goo.
 V_bcxx       = $(V_bcxx_$(V))
============================================================
--- .mtn-ignore	a0a936de20614bda0e4ebd6d09548d2b9127b9b7
+++ .mtn-ignore	d4e7d97ed47e8739db7f7292b8e176615623a204
@@ -32,8 +32,10 @@
 ^mkinstalldirs$
 ^monotone\.(cps?|fn|ky|pg|tp|vr|toc|pdf|ps|dvi|log|info(-[0-9]+)?)$
 ^monotone\.html$
+^mtn$
 ^mtn.1$
 ^mtn.dSYM$
+^mtnopt$
 ^po/Makefile(\.in)*$
 ^po/POTFILES$
 ^po/Rules-quot$
@@ -46,11 +48,9 @@
 ^po/monotone\.pot$
 ^po/quot\.sed$
 ^run_(func|tester|unit)_tests$
-^src/mtn$
 ^src/package_(full_)?revision(\.cc|\.txt|_(dist|raw)\.txt)$
 ^src/schema\.cc$
 ^src/std_hooks\.cc$
-^src/util/mtnopt$
 ^stamp-h1$
 ^stamp-vti$
 ^test/(func|tester|unit)\.status$