Skip to content

Commit 827d382

Browse files
committed
macdeploy: remove add-resources argument
1 parent 464b34d commit 827d382

File tree

1 file changed

+1
-26
lines changed

1 file changed

+1
-26
lines changed

contrib/macdeploy/macdeployqtplus

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ ap = ArgumentParser(description="""Improved version of macdeployqt.
514514
Outputs a ready-to-deploy app in a folder "dist" and optionally wraps it in a .dmg file.
515515
Note, that the "dist" folder will be deleted before deploying on each run.
516516
517-
Optionally, Qt translation files (.qm) and additional resources can be added to the bundle.""")
517+
Optionally, Qt translation files (.qm) can be added to the bundle.""")
518518

519519
ap.add_argument("app_bundle", nargs=1, metavar="app-bundle", help="application bundle to be deployed")
520520
ap.add_argument("-verbose", type=int, nargs=1, default=[1], metavar="<0-3>", help="0 = no output, 1 = error/warning (default), 2 = normal, 3 = debug")
@@ -523,7 +523,6 @@ ap.add_argument("-no-strip", dest="strip", action="store_false", default=True, h
523523
ap.add_argument("-dmg", nargs="?", const="", metavar="basename", help="create a .dmg disk image; if basename is not specified, a camel-cased version of the app name is used")
524524
ap.add_argument("-fancy", nargs=1, metavar="plist", default=[], help="make a fancy looking disk image using the given plist file with instructions; requires -dmg to work")
525525
ap.add_argument("-translations-dir", nargs=1, metavar="path", default=None, help="Path to Qt's translations. Base translations will automatically be added to the bundle's resources.")
526-
ap.add_argument("-add-resources", nargs="+", metavar="path", default=[], help="list of additional files or folders to be copied into the bundle's resources; must be the last argument")
527526
ap.add_argument("-volname", nargs=1, metavar="volname", default=[], help="custom volume name for dmg")
528527

529528
config = ap.parse_args()
@@ -543,16 +542,6 @@ app_bundle_name = os.path.splitext(os.path.basename(app_bundle))[0]
543542

544543
# ------------------------------------------------
545544

546-
for p in config.add_resources:
547-
if verbose >= 3:
548-
print("Checking for \"%s\"..." % p)
549-
if not os.path.exists(p):
550-
if verbose >= 1:
551-
sys.stderr.write("Error: Could not find additional resource file \"{}\"\n".format(p))
552-
sys.exit(1)
553-
554-
# ------------------------------------------------
555-
556545
if len(config.fancy) == 1:
557546
if verbose >= 3:
558547
print("Fancy: Importing plistlib...")
@@ -699,20 +688,6 @@ with open(os.path.join(applicationBundle.resourcesPath, "qt.conf"), "wb") as f:
699688

700689
# ------------------------------------------------
701690

702-
if len(config.add_resources) > 0 and verbose >= 2:
703-
print("+ Adding additional resources +")
704-
705-
for p in config.add_resources:
706-
t = os.path.join(applicationBundle.resourcesPath, os.path.basename(p))
707-
if verbose >= 3:
708-
print(p, "->", t)
709-
if os.path.isdir(p):
710-
shutil.copytree(p, t, symlinks=True)
711-
else:
712-
shutil.copy2(p, t)
713-
714-
# ------------------------------------------------
715-
716691
if config.dmg is not None:
717692

718693
def runHDIUtil(verb: str, image_basename: str, **kwargs) -> int:

0 commit comments

Comments
 (0)