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

[win32] Rebrand win32 BuildSetup and installer files #5185

Merged
merged 6 commits into from Sep 15, 2014

Conversation

MartijnKaijser
Copy link
Member

This "unifies" the builder/installer and easier to re-brand for Windows

To-do:

  1. VisualStudio files have the Kodi.exe/.pdb hardcoded. Possibly we could just name those .exe/.pdb files "Application.ext" and rename them in the BuildSetup.exe to "AppName.ext"?
  2. AppName/etc.. needs to be set in BuildSetup.bat and buildpvraddons.bat Would be nicer to also have it reading from version.txt
  3. Installer needs to properly handle the older installs. Need to further investigate this. Should we move the old install and userdata folder as well? For now I could revert the changes in the installer and keep it installed under "XBMC" so we can go forward with this.
  4. Rename "XBMC for Windows.nsi"
  5. Probably something I forgot.. :)

@MartijnKaijser
Copy link
Member Author

@wsoltys for review/ideas (or any other devs of course)

@Montellese
Copy link
Member

For the VS solution we wanted to renamed the VS2010Express directory anyway. I'd propose a more generic name as we are probably not gonna keep VS solution files for multiple versions around. Furthermore if we rename the XBMC project to Kodi we could use a builtin VS macro to define the executable name instead of repeating it 50 times in the project settings.

Concerning old installs. Ideally we would move the old XBMC userdata folder to a new Kodi userdata folder. Is is possible that windows will block access to a userdata folder that doesn't match the application

@Montellese
Copy link
Member

Two more things I just remembered:

  • Any reason the build directory in Win32BuildSetup is still named XBMC?
  • The build scripts unter tools/buildsteps/win32 will probably require similar treatment.

@MartijnKaijser
Copy link
Member Author

  • Do we still need the subfolder in WIN32_BUILD? Maybe call it "Application"?. I kept it XBMC for testing purpose.
  • Will look at tools/buildsteps/win32
  • I'd rather have the VS renaming in a separate PR (and i don't know how that macro works)
  • Moving the userdata shouldn't be an issue. just needs some thought/testing.

Edit:
Do you like the overall changes done here?

@wsoltys
Copy link

wsoltys commented Aug 10, 2014

Looks good at a glance although I doubt we'll need the rebranding much (hopefully) ;)
For the other stuff what @Montellese said. Use a VS var. Look for TargetName or similar.

@da-anda
Copy link
Member

da-anda commented Aug 10, 2014

I'd not move the XBMC folder for Helix but allow both, so that downgrades are possible without issues. So if XBMC folder is found, use it, if not, use kodi. And for v15 we move and drop XBMC folder.

@da-anda
Copy link
Member

da-anda commented Aug 10, 2014

sorry, misread. was talking about user data folder location

@MartijnKaijser
Copy link
Member Author

So not move, but copy the userdata folder and leave it there? Could do that. Leaves a lot of wasted space though. Having actually Kodi installed and pointing to an XBMC userdata folder is a no-go imo.
One way or another there will always be a transfer from one userdata name to the next in whatever version you do it.

@MartijnKaijser MartijnKaijser added this to the Pending for inclusion milestone Aug 11, 2014
@MartijnKaijser MartijnKaijser force-pushed the win32_rebrand branch 2 times, most recently from 0bbb873 to ffd2a99 Compare August 20, 2014 20:29
@MartijnKaijser MartijnKaijser force-pushed the win32_rebrand branch 5 times, most recently from 9726163 to 4520139 Compare September 14, 2014 12:59
@MartijnKaijser
Copy link
Member Author

PR update. Almost all changes are in the NSIS installer:
%appdata%/XBMC/userdata is moved to %appdata%/Kodi/userdata
[XBMC-InstDir]/portable_data/ is moved to [Kodi-InstDir]/portable_data/

One core code change:
Now fetch userdata from %appdata%/Kodi/userdata instead of %appdata%/XBMC/userdata (hence the move of the userdata)

@wsoltys @da-anda @Montellese (and any other win32 user). Could you test for screw ups (do backup before trying)?

@MartijnKaijser MartijnKaijser force-pushed the win32_rebrand branch 5 times, most recently from 041b54a to e3823d6 Compare September 14, 2014 15:02
@MartijnKaijser
Copy link
Member Author

jenkins build this please

@MartijnKaijser
Copy link
Member Author

jenkins build this please

@wsoltys
Copy link

wsoltys commented Sep 15, 2014

seems to work fine on my setup.

@MartijnKaijser
Copy link
Member Author

no clue why jenkins fails
http://jenkins.kodi.tv/job/WIN-32/2008/console
The file seems to be available and downloads just fine.

@MartijnKaijser MartijnKaijser modified the milestones: Helix 14.0-alpha4, Pending for inclusion Sep 15, 2014
MartijnKaijser added a commit that referenced this pull request Sep 15, 2014
[win32] Rebrand win32 BuildSetup and installer files
@MartijnKaijser MartijnKaijser merged commit cf8f8b2 into xbmc:master Sep 15, 2014
@MartijnKaijser MartijnKaijser deleted the win32_rebrand branch September 15, 2014 18:52
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.

None yet

4 participants