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

[code]

revision:            ac8ec392956da631b03cd66f275fe1395d56ab5a
date:                2011-02-04T08:21:16
author:              address@hidden
branch:              net.venge.monotone.source-tree-cleanup
changelog:
move innosetup files from <root>/src/win32 to <root>/innosetup

* innosetup/README.txt: New file (split from src/win32)

* innosetup/dlls.sh: renamed
* innosetup/modpath.iss: renamed
* innosetup/monotone.bmp: renamed
* innosetup/monotone.iss.in: renamed

* configure.ac: 
* Makefile.am: fix paths

manifest:
format_version "1"

new_manifest [a6d858d5560857283f1f623f75bc4a406e6fe821]

old_revision [f8c16717c5e7bc45eb57d1d3b8eca8653c0b98e4]

rename "src/win32/dlls.sh"
    to "innosetup/dlls.sh"

rename "src/win32/modpath.iss"
    to "innosetup/modpath.iss"

rename "src/win32/monotone.bmp"
    to "innosetup/monotone.bmp"

rename "src/win32/monotone.iss.in"
    to "innosetup/monotone.iss.in"

add_dir "innosetup"

add_file "innosetup/README.txt"
 content [86ad710152a8dcfa19b88adf1c1eb135e787454e]

patch "Makefile.am"
 from [191ee859fe3f5bac8801498526fafb3aa860ce3b]
   to [65326edb5ebdc5e621e261a7a3a1b81ab38330d1]

patch "configure.ac"
 from [8a0cadde1c1a91ffb79b4b5263c17e2471193585]
   to [fefe751910927cc8a95a9766966ae00a7beb6ae0]

patch "innosetup/monotone.iss.in"
 from [9de344bae589a2c065a62dfd315e3a9c072b1030]
   to [1800543d08b166faa10b73a217b03c827733e710]

patch "src/win32/README.txt"
 from [2aa8739c5c0d0a45c6ac685e378897458969b7ee]
   to [a9d050d61e65b930b30037ea88cbe92f5050bc66]
============================================================
--- Makefile.am	191ee859fe3f5bac8801498526fafb3aa860ce3b
+++ Makefile.am	65326edb5ebdc5e621e261a7a3a1b81ab38330d1
@@ -335,9 +335,9 @@ EXTRA_DIST =								\
 	util/audit-includes util/do-editor-vars.sh			\
 	$(wildcard $(srcdir)/m4/*.m4) doc/monotone.html doc/images	\
 	doc/texinfo.css src/schema.sql src/unix/README			\
-	src/util/mtnopt.in src/win32/README.txt				\
-	src/win32/monotone.iss.in src/win32/modpath.iss 		\
-	src/win32/monotone.bmp src/win32/dlls.sh			\
+	src/util/mtnopt.in innosetup/README.txt				\
+	innosetup/monotone.iss.in innosetup/modpath.iss 		\
+	innosetup/monotone.bmp innosetup/dlls.sh			\
 									\
 	src/std_hooks.lua						\
 	test/func test/func-testsuite.lua				\
@@ -483,7 +483,7 @@ dlls.iss: mtn-stripped.exe ${top_srcdir}
 
 dlls.iss: mtn-stripped.exe ${top_srcdir}/Makefile.am
 	rm -f $@
-	for DLL in $$( ${top_srcdir}/src/win32/dlls.sh mtn-stripped.exe | xargs cmd //c echo) ; do \
+	for DLL in $$( ${top_srcdir}/innosetup/dlls.sh mtn-stripped.exe | xargs cmd //c echo) ; do \
 	    echo "Source: \"$$DLL\"; DestDir: \"{app}\"" >> $@ ; \
 	done
 
============================================================
--- configure.ac	8a0cadde1c1a91ffb79b4b5263c17e2471193585
+++ configure.ac	fefe751910927cc8a95a9766966ae00a7beb6ae0
@@ -51,7 +51,7 @@ case "$host" in
     ac_executable_extensions=".exe"
     
     # Inno setup configuration
-    AC_CONFIG_FILES([monotone.iss:src/win32/monotone.iss.in])
+    AC_CONFIG_FILES([monotone.iss:innosetup/monotone.iss.in])
     AC_PATH_PROG(ISCC, [ISCC]) 
   ;;
 
============================================================
--- src/win32/README.txt	2aa8739c5c0d0a45c6ac685e378897458969b7ee
+++ src/win32/README.txt	a9d050d61e65b930b30037ea88cbe92f5050bc66
@@ -1,40 +1,7 @@
-This directory keeps the win32 specific files.
+This directory keeps the Win32 MinGW specific files.
 
-To create a MinGW release, the 'make dist' target does not work for
-MinGW. Instead, we use Inno Setup. Here are all the steps for
-creating a MinGW release, on a fresh Windows machine:
+Win32 Cygwin uses the Unix files.
 
-Install MinGW tools; see ../../INSTALL_windows_native.txt
+To build on MinGW, see ../../INSTALL_windows_native.txt
 
-Install a monotone binary; see http://monotone.ca/
-
-Install Inno Setup and Inno Setup preprocessor; see
-http://www.jrsoftware.org/isinfo.php, get the Quick Start Pack ispack-5.3.3.exe
-
-Get a copy of the monotone repository; see
-http://wiki.monotone.ca/MonotoneProjectServer/
-
-Check out the release version of monotone:
-mtn -d /path/to/monotone.db checkout -r t:monotone-<version> monotone-<version>
-
-Build the release. In an MSYS shell:
-cd monotone-<version>
-autoreconf -i
-./configure 
-make win32-installer
-
-That builds "monotone-<version>-setup.exe" in the current folder.
-
-NOTE:
-
-  If ISCC (Inno setup compiler) is not in PATH, then you must specify
-  its location:
-  
-    make win32-installer ISCC=/d/progs/InnoSetup5/ISCC.exe
-
-Publish the binary on the monotone website with proper permissions:
-
-chmod a+r monotone-<version>-setup.exe
-scp -p monotone-<version>-setup.exe address@hidden:<version>
-
-Download from the web and test, both the installed mtn and the documentation.
+To create a MinGW release see ../../innosetup/README.txt
============================================================
--- src/win32/monotone.iss.in	9de344bae589a2c065a62dfd315e3a9c072b1030
+++ innosetup/monotone.iss.in	1800543d08b166faa10b73a217b03c827733e710
@@ -24,7 +24,7 @@ ChangesEnvironment=true
 SolidCompression=yes
 LicenseFile="{#SRCDIR}\COPYING"
 ChangesEnvironment=true
-WizardImageFile={#SRCDIR}\src\win32\monotone.bmp
+WizardImageFile={#SRCDIR}\innosetup\monotone.bmp
 
 [Files]
 Source: "{#BUILDDIR}\mtn-stripped.exe"; DestDir: "{app}"; DestName: "mtn.exe"; Flags: ignoreversion
@@ -35,7 +35,7 @@ Source: "{#SRCDIR}\doc\monotone.info*"; 
 Source: "{#SRCDIR}\COPYING"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#SRCDIR}\doc\monotone.info*"; DestDir: "{app}\documentation"; Flags: ignoreversion
 
-; this file is generated by Makefile target "src/win32/dlls.iss"
+; this file is generated by Makefile target "dlls.iss"
 ; it creates list of distributable DLLs 
 #include "dlls.iss"
 
@@ -58,5 +58,5 @@ end;
   Result := ExpandConstant('{app}');
 end;
 
-#include "@address@hidden"
+#include "@address@hidden"
 
============================================================
--- /dev/null	
+++ innosetup/README.txt	86ad710152a8dcfa19b88adf1c1eb135e787454e
@@ -0,0 +1,40 @@
+This directory keeps the files needed to build the Windows native
+installer, using Inno Setup. 
+
+Here are all the steps for creating a MinGW release, on a fresh
+Windows machine:
+
+Install Inno Setup and Inno Setup preprocessor; see
+http://www.jrsoftware.org/isinfo.php, get the Quick Start Pack ispack-5.3.3.exe
+
+Install MinGW tools; see ../INSTALL_windows_native.txt
+
+Install a monotone binary; see http://monotone.ca/
+
+Get a copy of the monotone repository; see
+http://wiki.monotone.ca/MonotoneProjectServer/
+
+Check out the release version of monotone:
+mtn -d /path/to/monotone.db checkout -r t:monotone-<version> monotone-<version>
+
+Build the release. In an MSYS shell:
+cd monotone-<version>
+autoreconf -i
+./configure 
+make win32-installer
+
+That builds "monotone-<version>-setup.exe" in the current directory.
+
+NOTE:
+
+  If ISCC (Inno setup compiler) is not in PATH, then you must specify
+  its location:
+  
+    make win32-installer ISCC=/d/progs/InnoSetup5/ISCC.exe
+
+Publish the binary on the monotone website with proper permissions:
+
+chmod a+r monotone-<version>-setup.exe
+scp -p monotone-<version>-setup.exe address@hidden:<version>
+
+Download from the web and test, both the installed mtn and the documentation.