[Monotone-commits-diffs] net.venge.monotone: e3e76081b2bcd0a990ad0ee09fea7a7fc60bf7c2

[code]

revision:            e3e76081b2bcd0a990ad0ee09fea7a7fc60bf7c2
date:                2011-03-21T20:54:50
author:              Richard Levitte <address@hidden>
branch:              net.venge.monotone
changelog:
merge of '3ae2387b335123948d15e3f2521a411ccb8c5585'
     and 'c312be5d03b9ab6b4e2bebbd44b0b002743f173d'

manifest:
format_version "1"

new_manifest [e9e0c064f0709f6b75d458bd52b1a04241debcd7]

old_revision [3ae2387b335123948d15e3f2521a411ccb8c5585]

patch "Makefile.am"
 from [68326a1b02cd58304beabdeb5b91abe192f1c572]
   to [8df20d82b2cf66b3d26e59e5302babd78780fec9]

old_revision [c312be5d03b9ab6b4e2bebbd44b0b002743f173d]

patch "INSTALL_windows_cygwin.txt"
 from [1d597eaf91ab262f70b906fdeb2fefa29a06dbcb]
   to [46b16835478139759c0f52b531f16b6731e26314]

patch "Makefile.am"
 from [3b9dd229feb150f3ed03716cfabe1a0b40ff7003]
   to [8df20d82b2cf66b3d26e59e5302babd78780fec9]

patch "cygport/README.txt"
 from [ad5a3fd13d3200b9acb48cfe64c137ab14396f69]
   to [8b684783ed31d6dc1081daaa8b8536f88110ec1b]

patch "doc/Makefile.am"
 from [22cc36ab720cbb36025ad091d1f7445baa756653]
   to [dcc8331723e96245ccf9788fef5c02946580031e]
============================================================
--- Makefile.am	68326a1b02cd58304beabdeb5b91abe192f1c572
+++ Makefile.am	8df20d82b2cf66b3d26e59e5302babd78780fec9
@@ -362,18 +362,26 @@ examples_prefix = examples
 
 examplesdir = $(docdir)/examples
 examples_prefix = examples
-examples_data = $(shell cd $(srcdir); find $(examples_prefix) | sed -e 's,^\./,,')
+examples_data =								\
+	examples/000README.txt						\
+	examples/mirror.rc examples/push.rc examples/read-permissions	\
+	examples/write-permissions					\
+									\
+	examples/server-setup/README examples/server-setup/serverrc	\
+	examples/server-setup/monotone.init				\
+	examples/server-setup/monotone.run				\
+									\
+	examples/user-setup/README examples/user-setup/monotonerc
 
 EXTRA_DIST =								\
 	HACKING INSTALL INSTALL_windows_cygwin.txt			\
 	INSTALL_windows_native.txt README.visualc8 UPGRADE		\
 	util/audit-includes util/do-editor-vars.sh			\
-	$(wildcard $(srcdir)/m4/*.m4) src/schema.sql src/unix/README	\
-	src/util/mtnopt.in innosetup/README.txt				\
-	innosetup/monotone.iss.in innosetup/modpath.iss 		\
-	innosetup/monotone.bmp innosetup/dlls.sh			\
+	$(wildcard $(srcdir)/m4/*.m4)					\
 									\
-	src/std_hooks.lua						\
+	src/schema.sql src/unix/README src/std_hooks.lua		\
+	src/util/mtnopt.in						\
+									\
 	test/common							\
 	test/func test/func-testsuite.lua				\
 	test/tester test/tester-testsuite.lua				\
@@ -386,11 +394,35 @@ EXTRA_DIST =								\
 									\
 	src/package_revision.txt src/package_full_revision_dist.txt	\
 									\
-	mac notes visualc $(contrib_data) $(examples_data)		\
-									\
 	extra/README extra/building/dump-test-logs.sh.in		\
 	extra/shell/monotone.bash_completion.in				\
-	extra/shell/monotone_gen_bash_completion_table.pl
+	extra/shell/monotone_gen_bash_completion_table.pl		\
+									\
+	innosetup/README.txt						\
+	innosetup/monotone.iss.in innosetup/modpath.iss 		\
+	innosetup/monotone.bmp innosetup/dlls.sh			\
+									\
+	mac/readme-mac.txt mac/package-intro.rtf			\
+	mac/monotone.pmproj mac/monotone-pkg-logo.gif			\
+									\
+	cygport/README.txt						\
+	cygport/monotone-1.0-1.cygwin.patch				\
+	cygport/monotone-1.0-1.cygport					\
+									\
+	notes/release-checklist.txt					\
+	notes/README.testing notes/tester.txt notes/testsuite.txt	\
+									\
+	visualc/monotone.sln						\
+	visualc/monotone.vcproj visualc/botan.vcproj visualc/lua.vcproj	\
+	visualc/netxx.vcproj visualc/pcre.vcproj visualc/sqlite3.vcproj	\
+	visualc/stringprep.vcproj visualc/txt2c.vcproj			\
+	visualc/tester.vcproj visualc/unit_tester.vcproj		\
+	visualc/runtests.bat						\
+	visualc/config.h visualc/mt-stdint.h visualc/stdint.h		\
+	visualc/unistd.h						\
+	visualc/unknown_package.txt					\
+									\
+	$(contrib_data) $(examples_data)
 
 # Message translation support
 # INST_LINGUAS is set by configure, based on the po/LINGUAS file and
@@ -505,6 +537,11 @@ _install_data = \
 	    echo " $(MKDIR_P) '$(DESTDIR)$(3)/$$dest'"; \
 	    $(MKDIR_P) "$(DESTDIR)$(3)/$$dest" || exit $$?; \
 	  else \
+	    destd="`dirname $$dest`"; \
+	    if ! test -d "$(DESTDIR)$(3)/$$destd"; then \
+	      echo " $(MKDIR_P) '$(DESTDIR)$(3)/$$destd'"; \
+	      $(MKDIR_P) "$(DESTDIR)$(3)/$$destd" || exit $$?; \
+	    fi; \
 	    echo " $(INSTALL_DATA) $$src '$(DESTDIR)$(3)/$$dest'"; \
 	    $(INSTALL_DATA) $$src "$(DESTDIR)$(3)/$$dest" || exit $$?; \
 	  fi; \
============================================================
--- Makefile.am	3b9dd229feb150f3ed03716cfabe1a0b40ff7003
+++ Makefile.am	8df20d82b2cf66b3d26e59e5302babd78780fec9
@@ -326,22 +326,11 @@ if WIN32_PLATFORM
   test_bin_check_net_SOURCES = test/src/win32/tester-check-net.cc
   AM_CPPFLAGS += -DWIN32
   LDADD += -lshfolder -lws2_32 -liconv -liphlpapi
-
-  # Msys configure produces c:/ syntax for absolute paths, but Msys
-  # bash requires /c/ syntax. Fix that here. This fails if current
-  # drive is not c, but that just means checktest won't be found, and
-  # the network sync tests not run.
-  fix_abs_builddir := $(subst c:,/c,$(abs_builddir))
-
 else
   src_libplatform_a_SOURCES += $(UNIX_PLATFORM_SOURCES)
   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
-
-  # Cygwin configure also produces c:/ syntax, but that works for
-  # Cygwin bash
-  fix_abs_builddir := $(abs_builddir)
 endif
 
 if MISSING_INET_PTON
@@ -697,7 +686,7 @@ run_%_tests: Makefile
 run_%_tests: Makefile
 	$(AM_V_GEN){ echo '#!/bin/sh';						  	\
 	  echo 'export LANG=C';							  	\
-	  echo 'PATH=$(fix_abs_builddir):$(fix_abs_builddir)/test/bin:$$PATH';	  	\
+	  echo 'PATH=$(abs_builddir):$(abs_builddir)/test/bin:$$PATH';	  		\
 	  echo '$(top_builddir)/test/bin/tester $(srcdir)/test/$*-testsuite.lua "$$@"';	\
 	  echo 'echo $$? > $(top_builddir)/test/$*.status';		  	  	\
 	  echo 'exit 0'; } > $@ && \
============================================================
--- INSTALL_windows_cygwin.txt	1d597eaf91ab262f70b906fdeb2fefa29a06dbcb
+++ INSTALL_windows_cygwin.txt	46b16835478139759c0f52b531f16b6731e26314
@@ -36,4 +36,11 @@
 
  export CXXFLAGS="-I/usr/include/boost-1_33_1/ -g -O2"; configure
 
+There is a bug in the bash builtin 'pwd' in bash 4.1; it can return
+'c:/' syntax for absolute paths in some circumstances. See
+http://sourceware.org/ml/cygwin/2002-11/msg01111.html. In particular,
+this happens when starting a bash shell under Emacs, which results in
+configure creating Makefiles with some problems. A work-around is to
+put 'cd `/bin/pwd`' in your ~/.emacs_bash.
+
 See ../cygport/README for building a Cygwin package.
============================================================
--- doc/Makefile.am	22cc36ab720cbb36025ad091d1f7445baa756653
+++ doc/Makefile.am	dcc8331723e96245ccf9788fef5c02946580031e
@@ -35,24 +35,11 @@ EPS_FIGURES=$(PDF_FIGURES:.pdf=.eps)
 PNG_FIGURES=$(PDF_FIGURES:.pdf=.png)
 EPS_FIGURES=$(PDF_FIGURES:.pdf=.eps)
 
-# Copied from the main Makefile.am
-if WIN32_PLATFORM
-  # Msys configure produces c:/ syntax for absolute paths, but Msys
-  # bash requires /c/ syntax. Fix that here. This fails if current
-  # drive is not c, but that just means checktest won't be found, and
-  # the network sync tests not run.
-  fix_abs_builddir := $(subst c:,/c,$(abs_builddir))
-else
-  # Cygwin configure also produces c:/ syntax, but that works for
-  # Cygwin bash
-  fix_abs_builddir := $(abs_builddir)
-endif
-
 # See the rules further down that does the work.
-PDF_FIGURES_copied = $(addprefix $(fix_abs_builddir)/,$(PDF_FIGURES))
-PNG_FIGURES_copied = $(addprefix $(fix_abs_builddir)/,$(PNG_FIGURES))
-PNG_IMAGES_copied = $(addprefix $(fix_abs_builddir)/,$(PNG_IMAGES))
-HTML_EXTRA_copied = $(addprefix $(fix_abs_builddir)/,$(HTML_EXTRA))
+PDF_FIGURES_copied = $(addprefix $(abs_builddir)/,$(PDF_FIGURES))
+PNG_FIGURES_copied = $(addprefix $(abs_builddir)/,$(PNG_FIGURES))
+PNG_IMAGES_copied = $(addprefix $(abs_builddir)/,$(PNG_IMAGES))
+HTML_EXTRA_copied = $(addprefix $(abs_builddir)/,$(HTML_EXTRA))
 
 TEXI_FRAGMENTS = pcrepattern.texi pcresyntax.texi
 
@@ -79,19 +66,19 @@ figures/%.ps: figures/%.pdf
 	$(MKDIR_P) figures
 	pdftops $< $@
 
-$(fix_abs_builddir)/figures/%.pdf: figures/%.pdf
+$(abs_builddir)/figures/%.pdf: figures/%.pdf
 	$(MKDIR_P) figures
 	cmp -s $< $@ || cp $< $@
 
-$(fix_abs_builddir)/figures/%.png: figures/%.png
+$(abs_builddir)/figures/%.png: figures/%.png
 	$(MKDIR_P) figures
 	cmp -s $< $@ || cp $< $@
 
-$(fix_abs_builddir)/images/%.png: images/%.png
+$(abs_builddir)/images/%.png: images/%.png
 	$(MKDIR_P) images
 	cmp -s $< $@ || cp $< $@
 
-$(fix_abs_builddir)/texinfo.css: texinfo.css
+$(abs_builddir)/texinfo.css: texinfo.css
 	cmp -s $< $@ || cp $< $@
 
 # Stealing code from automake and adapting, we want a HTML file tree as well
============================================================
--- cygport/README.txt	ad5a3fd13d3200b9acb48cfe64c137ab14396f69
+++ cygport/README.txt	8b684783ed31d6dc1081daaa8b8536f88110ec1b
@@ -12,6 +12,7 @@
 $ cd ../monotone-build_cygwin; make dist-gzip
 $ cp ../monotone-build_cygwin/monotone-$NEW.tar.gz .
 $ cygport monotone-$NEW-1 all
+$ cp monotone-$NEW-1/spkg/monotone-$NEW-1.cygwin.patch .
 
 If cygport hangs, it may be due to a parallel make bug. Try the
 following: