[Monotone-commits-diffs] net.venge.monotone: 4988f05eea9445b6307f92597b8d8349eabe2841

[code]

revision:            4988f05eea9445b6307f92597b8d8349eabe2841
date:                2011-03-10T09:38:38
author:              address@hidden
branch:              net.venge.monotone
changelog:
find check_net.exe in MinGW

* INSTALL_windows_cygwin.txt: add -g -O2, since setting CXXFLAGS overrides them

* Makefile.am: workaround msys configure bug; find check_net.exe in MinGW

manifest:
format_version "1"

new_manifest [9052c051f377473d5c37353dd9c1b544235d7250]

old_revision [3ff7200913de3d977d688c401cdbf379bed77eac]

patch "INSTALL_windows_cygwin.txt"
 from [6466e85ad63129aecf6dfe4953352f6c0369079b]
   to [75c6a0c008fd97ae6ef83aad70e35a57c23c1034]

patch "Makefile.am"
 from [23a55f1b18ca961c54b6923dbeb061069f3eddba]
   to [bf818783abdb6b9c26fb50a40417d9f7a1907789]
============================================================
--- Makefile.am	23a55f1b18ca961c54b6923dbeb061069f3eddba
+++ Makefile.am	bf818783abdb6b9c26fb50a40417d9f7a1907789
@@ -317,11 +317,22 @@ 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
@@ -640,7 +651,7 @@ run_%_tests: Makefile
 run_%_tests: Makefile
 	$(AM_V_GEN){ echo '#!/bin/sh';						  	\
 	  echo 'export LANG=C';							  	\
-	  echo 'PATH=$(abs_builddir):$(abs_builddir)/test/bin:$$PATH';		  	\
+	  echo 'PATH=$(fix_abs_builddir):$(fix_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	6466e85ad63129aecf6dfe4953352f6c0369079b
+++ INSTALL_windows_cygwin.txt	75c6a0c008fd97ae6ef83aad70e35a57c23c1034
@@ -33,7 +33,7 @@
 dependencies is usually available soon after release.
 
 The following is needed to succesfully configure:
- export CXXFLAGS="-I/usr/include/boost-1_33_1/"; configure
+ export CXXFLAGS="-I/usr/include/boost-1_33_1/ -g -O2"; configure
 
 Easiest way to create a Cygwin package is using cygport
 (which must be installed separately as a Cygwin package)