Patchwork D8063: packaging: lowercase the `contrib` and `templates` directories with Inno

login
register
mail settings
Submitter phabricator
Date Feb. 1, 2020, 6:48 a.m.
Message ID <differential-rev-PHID-DREV-27n75ch22u2ygdnre2ho-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/44859/
State Superseded
Headers show

Comments

phabricator - Feb. 1, 2020, 6:48 a.m.
mharbison72 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  I have no idea why these (and `contrib/vim`) were leading with uppercase with
  Inno, but not WiX.  It probably doesn't matter too much, but might be a problem
  with `templates` if the user enabled case sensitivity on NTFS.

REPOSITORY
  rHG Mercurial

BRANCH
  stable

REVISION DETAIL
  https://phab.mercurial-scm.org/D8063

AFFECTED FILES
  contrib/packaging/hgpackaging/py2exe.py

CHANGE DETAILS




To: mharbison72, #hg-reviewers
Cc: mercurial-devel
phabricator - Feb. 1, 2020, 11:59 p.m.
indygreg added a comment.


  Did you test an upgrade over an existing install with this? My recollection is the case collision caused issues in my local testing, which is why I preserved the case difference between the installers.
  
  I would love to converge on lowercase. So if this just works, I would be thrilled.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D8063/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D8063

To: mharbison72, #hg-reviewers
Cc: indygreg, mercurial-devel
phabricator - Feb. 2, 2020, 5:19 a.m.
mharbison72 added a comment.


  I just did Inno 5.0.2 -> current Inno without uninstalling, and I didn't see any errors.  In this case, it preserves the existing capitalized names.  But since we renamed `help` -> `helptext`, `hgrc.d` -> `defaultrc`, and since the previous installer cleanup this cycle did some things like rename `Docs` -> `doc`, it's probably a good idea to uninstall before upgrading.  That said, it seemed like a functional installation (`version` and `debuginstall` worked).  A subsequent uninstall removed the entire mess, not just the newly dropped files.
  
  On a side note, I had put some `ui.status()` calls in to debug an unrelated problem, and that caused the `__version__.py` file to get a hex string in it somehow when building the installer, and that caused the new version parsing call that I added to explode.  It works without that debugging, so just an FYI if you're building installers for testing purposes and leave extra output around.  (I know the local `hg` is run to build that file and the output is captured, but I would have expected the extra output strings in there like I've seen before.)

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D8063/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D8063

To: mharbison72, #hg-reviewers
Cc: indygreg, mercurial-devel
phabricator - Feb. 2, 2020, 5:21 p.m.
This revision is now accepted and ready to land.
indygreg added a comment.
indygreg accepted this revision.


  OK. If an upgraded install works, I'm happy with landing this. We might as well land all the larger installer refactorings in this release. That should set us up for hopefully a less invasive switch to Python 3, as the install layouts will already be mostly identical.

REPOSITORY
  rHG Mercurial

BRANCH
  stable

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D8063/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D8063

To: mharbison72, #hg-reviewers, indygreg
Cc: indygreg, mercurial-devel

Patch

diff --git a/contrib/packaging/hgpackaging/py2exe.py b/contrib/packaging/hgpackaging/py2exe.py
--- a/contrib/packaging/hgpackaging/py2exe.py
+++ b/contrib/packaging/hgpackaging/py2exe.py
@@ -21,20 +21,20 @@ 
 
 
 STAGING_RULES = [
-    ('contrib/bash_completion', 'Contrib/'),
-    ('contrib/hgk', 'Contrib/hgk.tcl'),
-    ('contrib/hgweb.fcgi', 'Contrib/'),
-    ('contrib/hgweb.wsgi', 'Contrib/'),
-    ('contrib/logo-droplets.svg', 'Contrib/'),
-    ('contrib/mercurial.el', 'Contrib/'),
-    ('contrib/mq.el', 'Contrib/'),
-    ('contrib/tcsh_completion', 'Contrib/'),
-    ('contrib/tcsh_completion_build.sh', 'Contrib/'),
-    ('contrib/vim/*', 'Contrib/Vim/'),
+    ('contrib/bash_completion', 'contrib/'),
+    ('contrib/hgk', 'contrib/hgk.tcl'),
+    ('contrib/hgweb.fcgi', 'contrib/'),
+    ('contrib/hgweb.wsgi', 'contrib/'),
+    ('contrib/logo-droplets.svg', 'contrib/'),
+    ('contrib/mercurial.el', 'contrib/'),
+    ('contrib/mq.el', 'contrib/'),
+    ('contrib/tcsh_completion', 'contrib/'),
+    ('contrib/tcsh_completion_build.sh', 'contrib/'),
+    ('contrib/vim/*', 'contrib/vim/'),
     ('contrib/win32/postinstall.txt', 'ReleaseNotes.txt'),
     ('contrib/win32/ReadMe.html', 'ReadMe.html'),
-    ('contrib/xml.rnc', 'Contrib/'),
-    ('contrib/zsh_completion', 'Contrib/'),
+    ('contrib/xml.rnc', 'contrib/'),
+    ('contrib/zsh_completion', 'contrib/'),
     ('dist/hg.exe', './'),
     ('dist/lib/*.dll', 'lib/'),
     ('dist/lib/*.pyd', 'lib/'),
@@ -47,7 +47,7 @@ 
     ('mercurial/helptext/**/*.txt', 'helptext/'),
     ('mercurial/defaultrc/*.rc', 'defaultrc/'),
     ('mercurial/locale/**/*', 'locale/'),
-    ('mercurial/templates/**/*', 'Templates/'),
+    ('mercurial/templates/**/*', 'templates/'),
     ('COPYING', 'Copying.txt'),
 ]