Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos-caddy
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Guillaume Hervier
slapos-caddy
Commits
39fc2c7f
Commit
39fc2c7f
authored
Jul 31, 2013
by
Jondy Zhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos-windows-installer: fix cygwin/windows path problem
parent
bb32bbf3
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
6 deletions
+7
-6
software/slapos-windows-installer/instance.cfg.in
software/slapos-windows-installer/instance.cfg.in
+6
-4
software/slapos-windows-installer/software.cfg
software/slapos-windows-installer/software.cfg
+1
-2
No files found.
software/slapos-windows-installer/instance.cfg.in
View file @
39fc2c7f
...
...
@@ -19,11 +19,13 @@ pre-configure =
chmod +x $${:configure-command}
configure-command = $${buildout:directory}/bootloader.sh
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}/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
# The parameter "slaptester" is the password of slapos administrator
# passed to configure script
...
...
software/slapos-windows-installer/software.cfg
View file @
39fc2c7f
...
...
@@ -45,7 +45,6 @@ pre-configure=
mkdir -p ${:cygroot}/cygwin
(cd ${:cygroot} ; tar xjf ${inno-setup:location}/inno-setup.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-windows-wrapper:location}/slapos-windows-wrapper.bat ${:cygroot}
cp ${setup-cygwin:location}/setup-cygwin.bat ${:cygroot}
...
...
@@ -60,7 +59,7 @@ post-install= ${:cygroot}/slapos-windows-wrapper.bat slapos-build-installer
[instance-template]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg.in
md5sum = b
5bd277293c52ee66ec76cdc696d51a3
md5sum = b
78830f4591aa7ac93675348c51a1e90
output = ${buildout:directory}/instance.cfg
mode = 0644
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment