Changeset 57916


Ignore:
Timestamp:
Sep 18, 2009, 8:22:17 PM (11 years ago)
Author:
ryandesign@…
Message:

minivmac, minivmac-devel: don't copy the scripts to worksrcpath, since we're not modifying them; run them directly from filespath. This makes it easier to test changes to the scripts because you don't have to clean first.

Location:
users/ryandesign
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • users/ryandesign/minivmac-devel/Portfile

    r57914 r57916  
    138138extract.mkdir           yes
    139139
    140 build.dir               ${workpath}/variations
    141 
    142140post-extract {
    143     # Make the build directory.
    144     file mkdir ${build.dir}
    145    
    146     # Copy the scripts we need.
    147     xinstall -W ${filespath} attach.exp configure.applescript demacbinary.sh ${worksrcpath}
    148     xinstall -W ${filespath} Makefile.in ${build.dir}/Makefile
    149    
    150141    # Decode the system disk container image.
    151     my_system "${worksrcpath}/demacbinary.sh ${distpath}/${my_system_disk_container_distfile} ${worksrcpath}"
     142    my_system "sh ${filespath}/demacbinary.sh ${distpath}/${my_system_disk_container_distfile} ${worksrcpath}"
    152143   
    153144    # Copy the Disk Tools image from the container image. The binary patchfile applied with bspatch
     
    204195
    205196configure.cmd           osascript
    206 configure.pre_args      configure.applescript
     197configure.pre_args      ${filespath}/configure.applescript
     198
     199build.dir               ${workpath}/variations
    207200
    208201post-configure {
     202    file mkdir ${build.dir}
    209203    set my_variation_dirs ""
    210204    set my_output_disk_mount [my_attach_disk_image ${worksrcpath}/output.img]
     
    223217    }
    224218    my_detach_disk_image ${my_output_disk_mount}
     219   
     220    # Set up the global Makefile.
     221    xinstall ${filespath}/Makefile.in ${build.dir}/Makefile
    225222    reinplace "s|@SUBDIRS@|${my_variation_dirs}|" ${build.dir}/Makefile
    226223   
     
    269266# Mounts a disk image.
    270267proc my_attach_disk_image {disk_image} {
    271     global my_name worksrcpath
     268    global my_name filespath
    272269    set mountpoint [mkdtemp "/tmp/${my_name}.XXXXXXXX"]
    273270    # Use this expect script instead of using hdiutil directly, because the
    274271    # system disk image has a license agreement we must agree to.
    275     my_system "${worksrcpath}/attach.exp '${disk_image}' '${mountpoint}'"
     272    my_system "expect ${filespath}/attach.exp '${disk_image}' '${mountpoint}'"
    276273    return ${mountpoint}
    277274}
  • users/ryandesign/minivmac/Portfile

    r57914 r57916  
    117117extract.mkdir           yes
    118118
    119 build.dir               ${workpath}/variations
    120 
    121119post-extract {
    122     # Make the build directory.
    123     file mkdir ${build.dir}
    124    
    125     # Copy the scripts we need.
    126     xinstall -W ${filespath} attach.exp configure.applescript demacbinary.sh ${worksrcpath}
    127     xinstall -W ${filespath} Makefile.in ${build.dir}/Makefile
    128    
    129120    # Decode the system disk container image.
    130     my_system "${worksrcpath}/demacbinary.sh ${distpath}/${my_system_disk_container_distfile} ${worksrcpath}"
     121    my_system "sh ${filespath}/demacbinary.sh ${distpath}/${my_system_disk_container_distfile} ${worksrcpath}"
    131122   
    132123    # Copy the Disk Tools image from the container image.
     
    178169
    179170configure.cmd           osascript
    180 configure.pre_args      configure.applescript
     171configure.pre_args      ${filespath}/configure.applescript
     172
     173build.dir               ${workpath}/variations
    181174
    182175post-configure {
     176    file mkdir ${build.dir}
    183177    set my_variation_dirs ""
    184178    set my_src_disk_mount [my_attach_disk_image ${worksrcpath}/${my_src}/${my_src}.img]
     
    197191    }
    198192    my_detach_disk_image ${my_src_disk_mount}
     193   
     194    # Set up the global Makefile.
     195    xinstall ${filespath}/Makefile.in ${build.dir}/Makefile
    199196    reinplace "s|@SUBDIRS@|${my_variation_dirs}|" ${build.dir}/Makefile
    200197   
     
    267264# Mounts a disk image.
    268265proc my_attach_disk_image {disk_image} {
    269     global my_name worksrcpath
     266    global my_name filespath
    270267    set mountpoint [mkdtemp "/tmp/${my_name}.XXXXXXXX"]
    271268    # Use this expect script instead of using hdiutil directly, because the
    272269    # system disk image has a license agreement we must agree to.
    273     my_system "${worksrcpath}/attach.exp '${disk_image}' '${mountpoint}'"
     270    my_system "expect ${filespath}/attach.exp '${disk_image}' '${mountpoint}'"
    274271    return ${mountpoint}
    275272}
Note: See TracChangeset for help on using the changeset viewer.