Commit 39fc2c7f authored by Jondy Zhao's avatar Jondy Zhao

slapos-windows-installer: fix cygwin/windows path problem

parent bb32bbf3
...@@ -19,11 +19,13 @@ pre-configure = ...@@ -19,11 +19,13 @@ pre-configure =
chmod +x $${:configure-command} chmod +x $${:configure-command}
configure-command = $${buildout:directory}/bootloader.sh configure-command = $${buildout:directory}/bootloader.sh
pre-install = pre-install =
declare -r cyghome="$$(cygpath -m -a /)/.."
cp $$cyghome/setup.exe $${buildout:directory}
cp $$cyghome/certificate $${buildout:directory}/cygwin/certificate
cp $$cyghome/key $${buildout:directory}/cygwin/key
cp $$cyghome/test-computer.crt $${buildout:directory}/cygwin/computer.crt
cp $$cyghome/test-computer.key $${buildout:directory}/cygwin/computer.key
cp ${installer:cygroot}/slapos-windows-wrapper.bat $${buildout:directory}/slapos-windows-wrapper.bat cp ${installer:cygroot}/slapos-windows-wrapper.bat $${buildout:directory}/slapos-windows-wrapper.bat
cp ${installer:cygroot}/test-computer.key $${buildout:directory}/cygwin/computer.key
cp ${installer:cygroot}/test-/computer.crt $${buildout:directory}/cygwin/computer.crt
cp ${installer:cygroot}/.slapos/key $${buildout:directory}/cygwin/key
cp ${installer:cygroot}/.slapos/certificate $${buildout:directory}/cygwin/certificate
make-binary = true make-binary = true
# The parameter "slaptester" is the password of slapos administrator # The parameter "slaptester" is the password of slapos administrator
# passed to configure script # passed to configure script
......
...@@ -45,7 +45,6 @@ pre-configure= ...@@ -45,7 +45,6 @@ pre-configure=
mkdir -p ${:cygroot}/cygwin mkdir -p ${:cygroot}/cygwin
(cd ${:cygroot} ; tar xjf ${inno-setup:location}/inno-setup.tar.bz2) (cd ${:cygroot} ; tar xjf ${inno-setup:location}/inno-setup.tar.bz2)
(cd ${:cygroot} ; tar xjf ${cygwin-packages:location}/cygwin-packages.tar.bz2) (cd ${:cygroot} ; tar xjf ${cygwin-packages:location}/cygwin-packages.tar.bz2)
cp /usr/bin/setup.exe ${:cygroot}
cp ${slapos-build-installer:location}/slapos-build-installer ${:cygroot}/cygwin cp ${slapos-build-installer:location}/slapos-build-installer ${:cygroot}/cygwin
cp ${slapos-windows-wrapper:location}/slapos-windows-wrapper.bat ${:cygroot} cp ${slapos-windows-wrapper:location}/slapos-windows-wrapper.bat ${:cygroot}
cp ${setup-cygwin:location}/setup-cygwin.bat ${:cygroot} cp ${setup-cygwin:location}/setup-cygwin.bat ${:cygroot}
...@@ -60,7 +59,7 @@ post-install= ${:cygroot}/slapos-windows-wrapper.bat slapos-build-installer ...@@ -60,7 +59,7 @@ post-install= ${:cygroot}/slapos-windows-wrapper.bat slapos-build-installer
[instance-template] [instance-template]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg.in url = ${:_profile_base_location_}/instance.cfg.in
md5sum = b5bd277293c52ee66ec76cdc696d51a3 md5sum = b78830f4591aa7ac93675348c51a1e90
output = ${buildout:directory}/instance.cfg output = ${buildout:directory}/instance.cfg
mode = 0644 mode = 0644
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment