Skip to content

C
cpython
Commit 8554e302 authored by Jack Jansen's avatar Jack Jansen
Browse files
Options

BuildApplet will now also update old applets

parent ebe914af
Hide whitespace changes
Inline Side-by-side
Showing with 96 additions and 68 deletions
Mac/scripts/BuildApplet.py
View file @ 8554e302
...@@ -67,7 +67,7 @@ def main(): ...@@ -67,7 +67,7 @@ def main():
# Ask for source text if not specified in sys.argv[1:] # Ask for source text if not specified in sys.argv[1:]
if not sys.argv[1:]: if not sys.argv[1:]:
srcfss, ok = macfs.PromptGetFile('Select Python source file:', 'TEXT') srcfss, ok = macfs.PromptGetFile('Select Python source or applet:', 'TEXT', 'APPL')
if not ok: if not ok:
return return
filename = srcfss.as_pathname() filename = srcfss.as_pathname()
...@@ -75,15 +75,24 @@ def main(): ...@@ -75,15 +75,24 @@ def main():
if tf[-3:] == '.py': if tf[-3:] == '.py':
tf = tf[:-3] tf = tf[:-3]
else: else:
tf = tf + '.applet' tf = tf + '.out'
dstfss, ok = macfs.StandardPutFile('Save application as:', tf) dstfss, ok = macfs.StandardPutFile('Save application as:', tf)
if not ok: return if not ok: return
process(template, filename, dstfss.as_pathname()) dstfilename = dstfss.as_pathname()
cr, tp = MacOS.GetCreatorAndType(filename)
if tp == 'APPL':
update(template, filename, dstfilename)
else:
process(template, filename, dstfilename)
else: else:
# Loop over all files to be processed # Loop over all files to be processed
for filename in sys.argv[1:]: for filename in sys.argv[1:]:
process(template, filename, '') cr, tp = MacOS.GetCreatorAndType(filename)
if tp == 'APPL':
update(template, filename, '')
else:
process(template, filename, '')
def process(template, filename, output): def process(template, filename, output):
...@@ -116,10 +125,23 @@ def process(template, filename, output): ...@@ -116,10 +125,23 @@ def process(template, filename, output):
if output: if output:
destname = output destname = output
process_common(template, progress, code, rsrcname, destname, 0)
def update(template, filename, output):
if DEBUG:
progress = EasyDialogs.ProgressBar("Updating %s..."%os.path.split(filename)[1], 120)
else:
progress = None
if not output:
output = filename + ' (updated)'
process_common(template, progress, None, filename, output, 1)
def process_common(template, progress, code, rsrcname, destname, is_update):
# Try removing the output file # Try removing the output file
try: try:
os.unlink(output) os.unlink(destname)
except os.error: except os.error:
pass pass
...@@ -163,7 +185,11 @@ def process(template, filename, output): ...@@ -163,7 +185,11 @@ def process(template, filename, output):
if DEBUG: if DEBUG:
progress.inc(50) progress.inc(50)
else: else:
typesfound, ownertype = copyres(input, output, [], 0, progress) if is_update:
skip_oldfile = ['cfrg']
else:
skip_oldfile = []
typesfound, ownertype = copyres(input, output, skip_oldfile, 0, progress)
CloseResFile(input) CloseResFile(input)
# Check which resource-types we should not copy from the template # Check which resource-types we should not copy from the template
...@@ -195,32 +221,33 @@ def process(template, filename, output): ...@@ -195,32 +221,33 @@ def process(template, filename, output):
UseResFile(output) UseResFile(output)
# Delete any existing 'PYC ' resource named __main__ if code:
# Delete any existing 'PYC ' resource named __main__
try:
res = Get1NamedResource(RESTYPE, RESNAME) try:
res.RemoveResource() res = Get1NamedResource(RESTYPE, RESNAME)
except Error: res.RemoveResource()
pass except Error:
pass
# Create the raw data for the resource from the code object
if DEBUG:
progress.label("Write PYC resource...")
progress.set(120)
data = marshal.dumps(code)
del code
data = (MAGIC + '\0\0\0\0') + data
# Create the resource and write it
id = 0 # Create the raw data for the resource from the code object
while id < 128: if DEBUG:
id = Unique1ID(RESTYPE) progress.label("Write PYC resource...")
res = Resource(data) progress.set(120)
res.AddResource(RESTYPE, id, RESNAME)
res.WriteResource() data = marshal.dumps(code)
res.ReleaseResource() del code
data = (MAGIC + '\0\0\0\0') + data
# Create the resource and write it
id = 0
while id < 128:
id = Unique1ID(RESTYPE)
res = Resource(data)
res.AddResource(RESTYPE, id, RESNAME)
res.WriteResource()
res.ReleaseResource()
# Close the output file # Close the output file
...@@ -252,8 +279,8 @@ def copyres(input, output, skiptypes, skipowner, progress=None): ...@@ -252,8 +279,8 @@ def copyres(input, output, skiptypes, skipowner, progress=None):
res = Get1IndResource(type, ires) res = Get1IndResource(type, ires)
id, type, name = res.GetResInfo() id, type, name = res.GetResInfo()
lcname = string.lower(name) lcname = string.lower(name)
if (type, lcname) == (RESTYPE, RESNAME): ## if (type, lcname) == (RESTYPE, RESNAME):
continue # Don't copy __main__ from template ## continue # Don't copy __main__ from template
# XXXX should look for id=0 # XXXX should look for id=0
if lcname == OWNERNAME: if lcname == OWNERNAME:
if skipowner: if skipowner:
......
Mac/scripts/BuildApplet.rsrc.hqx
View file @ 8554e302
(This file must be converted with BinHex 4.0) (This file must be converted with BinHex 4.0)
:%%*eD@aN3A"`E'9d,R*cFQ-!FR0bBe*6483"!*!(#bSMM`#3"!%!!!!++3!!#5N :%%*eD@aN3A"`E'9d,R*cFQ-!FR0bBe*6483"!*!(#dPr5J#3"!%!!!!+2!!!#6`
!!!%"0K3J9#"S!"3J8(d4X'J4!$S"CbB5,`a1ZJ)-$$S!@RN0E@YKF("XCA3ZFR0 !!!%00K3J9#"S!"3J8(d4X'J4!$S"CbB5,`a1ZJ)-$$S!@RN33R9TE'4"F("XCA3
bB`)!!!!rN!J!N!JrN!J!N"L`(eFK!*!'#bVr%F#SD3%G3"(rma0`!"!Zrr1pdK& ZFR0bBf0PFh&iBbjSFAJZ1'*XE!!!FR0bBe*6483"!!"!!!%!N!m"Al1`(eFK!*!
Q%&%f[P9V!3&#4,fK[P9V!3%`86)"Caj%&3`!!"aP%R!!%#j$&3`!!"pL"R!"B!! '#bVr%F#SD3%G3"(rma0`!"!Zrr1pdK&Q%&%f[P9V!3&#4,fK[P9V!3%`86)"Caj
"!3)X@P3Y,N5p!3!E2!&Q-#G92KT+J#"6!LJ![`!Z)J$Y#3)"!%#$+0Xd%kRA,`a %&3`!!"aP%R!!%#j$&3`!!"pL"R!"B!!"!3)X@P3Y,N5p!3!E2!&Q-#G92KT+J#"
1ZJ%*5QGV!3#Q9d-k!!!"!*!,3!!!!+!!!!&3!!!#U!!!"&3!!!NN!!!5P!!$rrm 6!LJ![`!Z)J$Y#3)"!%#$+0Xd%kRA,`a1ZJ%*5QGV!3#Q9d-k!!!"!*!,3!!!!+!
!"!!!J!2rr`!"!!)!!3!#!!%!!`!"!!2J!3!$)!%!!L!"!!)J!rrr,J3!!,i$rrm !!!&3!!!#U!!!"&3!!!NN!!!5P!!$rrm!"!!!J!2rr`!"!!)!!3!#!!%!!`!"!!2
1!+`%!!'Z#!!"rK!!!"!J!!!)3!!!")!!!!-!N"K!!!!!i!!!!I!!!!2i!!!(r!! J!3!$)!%!!L!"!!)J!rrr,J3!!,i$rrm1!+`%!!'Z#!!"rK!!!"!J!!!)3!!!")!
!$r`!!"rm!!2rr`!(rrq!!rrr!!(rrJ!"rri!!Irr!!(rrq!"rrmJ!Irq)!(rrL! !!!-!N"K!!!!!i!!!!I!!!!2i!!!(r!!!$r`!!"rm!!2rr`!(rrq!!rrr!!(rrJ!
$rrmZ"rrr[J2rr`i!rr`!!Iri!!(rm!!!(q!!!!r!!!!(J!!!!`#3%3T3i!!HK)! "rri!!Irr!!(rrq!"rrmJ!Irq)!(rrL!$rrmZ"rrr[J2rr`i!rr`!!Iri!!(rm!!
!"k%J!!!!"d&38%`!N!C!!!!"!!+!"8!)3$ri%"!3(K!5%"-rq`iJ$N!#J!%!N!8 !(q!!!!r!!!!(J!!!!`#3%3T3i!!HK)!!"k%J!!!!"d&38%`!N!C!!!!"!!+!"8!
"!!1!"m!2`$ri(r!IrKrb(r-rq`rJ$m!$J!%!N!8%!*"5r`#3([m!r`#3(2m!X!$ )3$ri%"!3(K!5%"-rq`iJ$N!#J!%!N!8"!!1!"m!2`$ri(r!IrKrb(r-rq`rJ$m!
r!*!Dr`#`!,!!r`#3'2m!!!#`!2m&r`#3&[m!!,!!!2m&"Im!N"Ar!!#`!,!!!2m $J!%!N!8%!*"5r`#3([m!r`#3(2m!X!$r!*!Dr`#`!,!!r`#3'2m!!!#`!2m&r`#
&r`#3%2q3%J#3$Im!!#X!+j!+q5[jqIm!N!hrN")!N!rr!!!VN!VjqIm!N"$r!!! 3&[m!!,!!!2m&"Im!N"Ar!!#`!,!!!2m&r`#3%2q3%J#3$Im!!#X!+j!+q5[jqIm
!+j!)qIRjr`#3%2m!!#Z3#[Rjrrm!N!rr!!!!+j!)qIRjrj!&!*!-r`!!+j!+qIR !N!hrN")!N!rr!!!VN!VjqIm!N"$r!!!!+j!)qIRjr`#3%2m!!#Z3#[Rjrrm!N!r
rr`!!r`#3$2m!!!!VN!MjqIRr!!!!r`#3$2m!!#Z3#[Rjr`!!!2m!N![rN")!!2m r!!!!+j!)qIRjrj!&!*!-r`!!+j!+qIRrr`!!r`#3$2m!!!!VN!MjqIRr!!!!r`#
!APjH!*!'r`!!+`!VN!Vj+rRjr`$rrejHAJ#3"rq3%J#3"&jHAJ#3#E!&X!@`X2N 3$2m!!#Z3#[Rjr`!!!2m!N![rN")!!2m!APjH!*!'r`!!+`!VN!Vj+rRjr`$rrej
VN!Ajr`#3%E#`"E!&X,#`q5XV+rRr!*!5X*!)q5XVqIm!N"IrqC!%+rRr!*!CrrN HAJ#3"rq3%J#3"&jHAJ#3#E!&X!@`X2NVN!Ajr`#3%E#`"E!&X,#`q5XV+rRr!*!
V+rRr!*!ErrRjr`#3(Irr!*"b!J#3+3m!N!r`m!#3$3m&$`#3$I"382!!N!X2!!8 5X*!)q5XVqIm!N"IrqC!%+rRr!*!CrrNV+rRr!*!ErrRjr`#3(Irr!*"b!J#3+3m
2(`#3#r!&!2%I!*!+$`"38!mI!*!)rj!*!*!'$`$!c*!&h0h`!*!'rj!*!*!($`$ !N!r`m!#3$3m&$`#3$I"382!!N!X2!!82(`#3#r!&!2%I!*!+$`"38!mI!*!)rj!
-N!AGm!#3"`m!$-c-c-hGm!#3"`m!c*!&hIm!N!F2!!c-c-c0hIrrm!#3"3m!c*! *!*!'$`$!c*!&h0h`!*!'rj!*!*!($`$-N!AGm!#3"`m!$-c-c-hGm!#3"`m!c*!
&hIm!m!#3"3m!$-c-c-hGm!$`!*!&$`$-N!AGm!$`!*!&rj!*!2#lX!!!$`$!c*! &hIm!N!F2!!c-c-c0hIrrm!#3"3m!c*!&hIm!m!#3"3m!$-c-c-hGm!$`!*!&$`$
&h0h`rlZ`!!!!rj!*!!#lX!#3"&&49Gc-c0m!N!J&89&9AFc0m!#3#!99999Gc0m -N!AGm!$`!*!&rj!*!2#lX!!!$`$!c*!&h0h`rlZ`!!!!rj!*!!#lX!#3"&&49Gc
!N!X2hGh0m!#3$2h-h`#3$3rGm!#3$[m!N$S"!*!Br`#3$[m!r`#3$2m!X!$r!*! -c0m!N!J&89&9AFc0m!#3#!99999Gc0m!N!X2hGh0m!#3$2h-h`#3$3rGm!#3$[m
+r`#3"2m&!*!(rj!,!*!'r`!VN!Ajr`#3"rm!+j!&qIq3"!#3"2m!+j!&qIm!!2m !N$S"!*!Br`#3$[m!r`#3$2m!X!$r!*!+r`#3"2m&!*!(rj!,!*!'r`!VN!Ajr`#
!N!6r!#Z3"IRr!!"HAJ!!rj!,!&jH!*!%X,#`+b[jr`#3#E#`X#[jr`#3$2rjr`# 3"rm!+j!&qIq3"!#3"2m!+j!&qIm!!2m!N!6r!#Z3"IRr!!"HAJ!!rj!,!&jH!*!
3$[m!N"Z!!*!,$`#3"r$`!*!&$`82!*!&m!!2%!!!!2q3"I!!!!m-c-cI!!!!$`c %X,#`+b[jr`#3#E#`X#[jr`#3$2rjr`#3$[m!N"Z!!*!,$`#3"r$`!*!&$`82!*!
-c0rrm!!2$-c-h`$`!!m-c-cI!,X!rj!&m,X!!&9FcI!!N!49A0m!N!Epm!#3"Jm &m!!2%!!!!2q3"I!!!!m-c-cI!!!!$`c-c0rrm!!2$-c-h`$`!!m-c-cI!,X!rj!
!N!m(9%9B9!!"!*!%*&"jG$%!!!!"4P*&4J!"!!!!J!!"!)&*3diM!!%!!!%X!!% &m,X!!&9FcI!!N!49A0m!N!Epm!#3"Jm!N!m(9%9B9!!"!*!%!3#3"!FUN!3!!J#
!N!8"!!!!!3!!!!ST!!!*+3!!!3%"`GTX%pB!!!!F!2)!#8*14%`!!!"55801)`! 3"#a3HA3a!!!!!8C548B!!J!!!)!!!3#"!!)!JNP$6L-!!J!!!5`!!3!!!!)!N!3
!!&j659T&!!!!DNC548B!!3"fD@0c)`!!!)jTBf`i!!!!QQPME$3!!!#QD@0c1!! "!!!!#M`!!!Nm!!!"$3FdRi3RUJ!!!"`!rJ!*3Nj%6!!!!&**3diM!!!!AP0*@N8
!!,*TBh-d!!!![P"jG$%!!!$+!)$rr`!!#2`"`Hj8!5crr`#3"!("m%6rN!3!!!% !!!"U4P*&4J!#!(CTBh-M!!!!QQPME$J!!!#QD@0X0!!!!,*TBh-i!!!![QPMFc3
%!*!&J2rr!!!"%J("lYJ!JIrr!!!)m3("m%J",2rr!!!"(3("llJ",2rr!!!"B3( !!!$+8(Pd-3!!!0B!J2rr!!!*$!FdR-!",2rr!*!%"c5G$2q3"!!!!33!N!@!rrm
"lQ3",2rr!!!&C3("leJ",2rr!!!(D3("m"3",2rr!!!)E3("lS!!N!B**!("lr! !!!%5"c5G#!#"rrm!!!Ma"c5G"!##rrm!!!N""c5FV!%Xrrm!!!%G"c5FZ!%Xrrm
16hGZCA)JFQ9cEh9bBf@kGJ: !!!&K"c5F[!%Xrrm!!!9P"c5Fb!%Xrrm!!!GT"c5FY!%Xrrm!!!KY"c5Fa!#3"JM
m"c5G!!j2GfjPFL"bCA0[GA*MCE4F:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7