slapos-windows-installer: fix path

software/slapos-windows-installer/instance.cfg.in

 [buildout]
 parts =
-  rootdirectory
-  basedirectory
   slapos-instance
 
 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
 offline = true
 
-[rootdirectory]
-recipe = slapos.cookbook:mkdirectory
-etc = $${buildout:directory}/etc
-var = $${buildout:directory}/var
-srv = $${buildout:directory}/srv
-bin = $${buildout:directory}/bin
-tmp = $${buildout:directory}/tmp
-
-[basedirectory]
-recipe = slapos.cookbook:mkdirectory
-log = $${rootdirectory:var}/log
-services = $${rootdirectory:etc}/service
-scripts = $${rootdirectory:etc}/run
-run = $${rootdirectory:var}/run
-backup = $${rootdirectory:srv}/backup
-promises = $${rootdirectory:etc}/promise
-
 [slapos-instance]
-recipe = recipe = slapos.recipe.cmmi
-url = ${buildout:directory}/slapos-0.158.8-windows-all-in-one.exe
+recipe = slapos.recipe.cmmi
+# This url is useless
+url = /usr/bin/true.exe
 configure-command = msiexec.exe
-configure-options = /SILENT
+configure-options =
+  /i ${installer:location}/slapos-windows-all-in-one.exe
+  TARGETDIR=$${buildout:directory}
+  /quiet
+  /log $${buildout:directory}/slapos-windows-installer.log
 make-binary = true
-post-install = slapos-configure.sh
-
-  
\ No newline at end of file
+post-install = 
+  $${buildout:directory}/cygwin/etc/slapos/scripts/slapos-configure.sh

software/slapos-windows-installer/software.cfg

@@ -7,36 +7,40 @@ parts =
   setup-cygwin
   slapos-build-installer
   inno-setup
-  windows-installer
+  installer
   instance-template
 
 [inno-setup]
 recipe = hexagonit.recipe.download
 url = http://dashingsoft.com/products/slapos/inno-setup.tar.gz
 md5sum = 44620b8619c9cc5b3e262655f0089f05
-destination = ${buildout:directory}
+download-only = true
 
 [slapos-build-installer]
 recipe = hexagonit.recipe.download
 url = http://git.erp5.org/gitweb/slapos.package.git/blob_plain/heads/cygwin:/windows/scripts/slapos-build-installer
 md5sum = 217066b8a5bda72e52d97b04461bd9f1
-destination = ${buildout:directory}/bin
 download-only = true
 
 [setup-cgywin]
 recipe = hexagonit.recipe.download
 url = http://git.erp5.org/gitweb/slapos.package.git/blob_plain/heads/cygwin:/windows/scripts/setup-cygwin.bat
 md5sum = 5ec4f11eee39230a38ef3d2ba59fde44
-destination = ${buildout:directory}/bin
 download-only = true
 
-[windows-installer]
+[installer]
 recipe = slapos.recipe.cmmi
 url = http://dashingsoft.com/products/slapos/cygwin-packages.tar.gz
-configure-command = setup-cygwin.bat
-configure-options = 
-make-binary = slapos-build-installer
+pre-configure=
+  mkdir -p ${:location}/cygwin
+  (cd ${:location}/cygwin ; tar xzf ${inno-setup:location}/inno-setup.tar.gz)
+  cp /usr/bin/setup.exe ${:location}
+  cp ${setup-cygwin}/setup-cygwin.bat ${:location}/cygwin
+  cp ${slapos-build-installer}/slapos-build-installer ${:location}/cygwin
+configure-command = ${buildout:directory}/setup-cygwin.bat
+make-binary = ${:location}/cygwin/bin/bash --login /slapos-build-installer
 make-options =
+  --inno-setup=/inno-setup/ISCC.exe
 
 #----------------
 #-- Instance-level buildout profiles.