Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

customize windows install for this product #28

Merged
merged 4 commits into from
Mar 26, 2018
Merged

Conversation

marcparadise
Copy link
Member

No description provided.

@marcparadise marcparadise requested review from a team and scotthain March 23, 2018 21:58
@tyler-ball
Copy link
Contributor

I have no idea what I am looking at here. Can you walk me through this on Monday @marcparadise ?

@marcparadise marcparadise force-pushed the windows-build-fix branch 2 times, most recently from 73adc64 to bff41ab Compare March 26, 2018 15:10
@@ -58,7 +58,7 @@

<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFilesFolder">
<Directory Id="INSTALLLOCATION" Name="opscode">
<Directory Id="INSTALLLOCATION" Name="chef">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should be opscode as the installation path will be c:\opscode\chef-workstaiton

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's what we've been trying to fix - to install to a proper location Program Files\Chef/Workstation. We've tabled that for now as it was turning into a rabbit warren...

@@ -58,7 +58,7 @@

<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFilesFolder">
Copy link
Contributor

@jaymalasinha jaymalasinha Mar 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The example I followed has this as <Directory Id="WindowsVolume">

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That comes from wanting to install to C:/Opscode instead of C:/Program Files - the Id ProgramFilesFolder will resolve to "C:\Program Files".

The default installation ran into some errors.  This
change includes a custom wxs build script that does the right
things for workstation.

At this time windows installations will default to
C:/opscode/chef-workstation;
however we intend to come back and use C:\Program Files\Chef\Workstation
if omnibus can be modified to better support it.
@@ -17,14 +17,20 @@
name "chef-workstation"
friendly_name "Chef Workstation"
maintainer "Chef Software, Inc. <maintainers@chef.io>"
homepage "TBD"
homepage "https://chef.sh"

license "Apache-2.0"
license_file "../LICENSE"

# Defaults to C:/chef-workstation on Windows
# and /opt/chef-workstation on all other platforms
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

explain why we're being explicit

dependency "clean-static-libs"
dependency "version-manifest"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

revert

@@ -35,6 +35,7 @@
dependency "bundler"
dependency "ruby"
dependency "appbundler"
dependency "version-manifest"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

revert

-->
<% if fastmsi %>
<SetProperty Id="FastUnzip"
Value="FASTZIPDIR=[INSTALLLOCATION];FASTZIPAPPNAME=chef_workstation"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should be a hyphen

Copy link
Contributor

@tyler-ball tyler-ball left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Went over this with @marcparadise - Looks good! Always love reading XML

@marcparadise marcparadise merged commit 6a2fc92 into master Mar 26, 2018
@marcparadise marcparadise deleted the windows-build-fix branch March 26, 2018 18:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants