[Monotone-commits-diffs] net.venge.monotone: 3ae2387b335123948d15e3f2521a411ccb8c5585

[code]

revision:            3ae2387b335123948d15e3f2521a411ccb8c5585
date:                2011-03-21T07:39:56
author:              address@hidden
branch:              net.venge.monotone
changelog:
revert fix_abs_builddir workaround; found a better one

* INSTALL_windows_cygwin.txt: doc workaround for pwd bug

* doc/Makefile.am: 
* Makefile.am: revert fix_abs_builddir workaround; found a better one

* cygport/README.txt: copy new patch file


manifest:
format_version "1"

new_manifest [3ee7364c304f706894da4432c78ed182b57aa936]

old_revision [3783ae01d7531e5b4e853211bd8b092f698f2450]

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

patch "Makefile.am"
 from [a1b913a9a042b4c35c3da9270cb64f0c1f5907e6]
   to [68326a1b02cd58304beabdeb5b91abe192f1c572]

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

patch "doc/Makefile.am"
 from [22cc36ab720cbb36025ad091d1f7445baa756653]
   to [dcc8331723e96245ccf9788fef5c02946580031e]
============================================================
--- Makefile.am	a1b913a9a042b4c35c3da9270cb64f0c1f5907e6
+++ Makefile.am	68326a1b02cd58304beabdeb5b91abe192f1c572
@@ -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
@@ -660,7 +649,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: