VirtualBox

Changeset 82743 in vbox


Ignore:
Timestamp:
Jan 14, 2020 5:06:30 PM (5 years ago)
Author:
vboxsync
Message:

GARepack: Removed unnecessary copy-to-obj-dir rules and added missing clean line for the one file that needed that explicit rule. bugref:9587

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Additions/WINNT/Installer/Makefile.kmk

    r82729 r82743  
    245245RePackScriptsAdd_INSTTYPE = stage
    246246RePackScriptsAdd_SOURCES = \
    247         $(RePackScriptsAdd_0_OUTDIR)/UnpackBlessedDrivers.cmd \
     247        ../../../Installer/win/Scripts/UnpackBlessedDrivers.cmd \
    248248        $(RePackScriptsAdd_0_OUTDIR)/PackDriversForSubmission.cmd \
    249249        $(RePackScriptsAdd_0_OUTDIR)/Combined-1-Prepare.cmd \
    250250        $(RePackScriptsAdd_0_OUTDIR)/Combined-3-RepackAdditions.cmd \
    251251        $(RePackScriptsAdd_0_OUTDIR)/sign-ev.cmd
    252 
    253 INSTALLS += RePackScriptsAddResources
    254 RePackScriptsAddResources_TEMPLATE = DUMMY
    255 RePackScriptsAddResources_INST = repack/add/resources/
    256 RePackScriptsAddResources_INSTTYPE = stage
    257 RePackScriptsAddResources_SOURCES = \
    258         $(RePackScriptsAddResources_0_OUTDIR)/welcome.bmp \
    259         $(RePackScriptsAddResources_0_OUTDIR)/VirtualBoxGA-vista.ico \
    260         $(RePackScriptsAddResources_0_OUTDIR)/VirtualBoxGA-nsis.ico \
    261         $(RePackScriptsAddResources_0_OUTDIR)/iexplore.ico \
    262         $(RePackScriptsAddResources_0_OUTDIR)/License-gpl-2.0.rtf \
    263         $(RePackScriptsAddResources_0_OUTDIR)/VBoxGuestAdditions.nsi \
    264         $(RePackScriptsAddResources_0_OUTDIR)/dumplog.nsh \
    265         $(RePackScriptsAddResources_0_OUTDIR)/ReplaceDLL.nsh \
    266         $(RePackScriptsAddResources_0_OUTDIR)/servicepack.nsh \
    267         $(RePackScriptsAddResources_0_OUTDIR)/strstr.nsh \
    268         $(RePackScriptsAddResources_0_OUTDIR)/VBoxGuestAdditionsCommon.nsh \
    269         $(RePackScriptsAddResources_0_OUTDIR)/VBoxGuestAdditionsExternal.nsh \
    270         $(RePackScriptsAddResources_0_OUTDIR)/VBoxGuestAdditionsLog.nsh\
    271         $(RePackScriptsAddResources_0_OUTDIR)/VBoxGuestAdditionsNT4.nsh \
    272         $(RePackScriptsAddResources_0_OUTDIR)/VBoxGuestAdditionsUninstall.nsh \
    273         $(RePackScriptsAddResources_0_OUTDIR)/VBoxGuestAdditionsUninstallOld.nsh \
    274         $(RePackScriptsAddResources_0_OUTDIR)/VBoxGuestAdditionsVista.nsh\
    275         $(RePackScriptsAddResources_0_OUTDIR)/VBoxGuestAdditionsW2KXP.nsh\
    276         $(RePackScriptsAddResources_0_OUTDIR)/winver.nsh \
    277         $(RePackScriptsAddResources_0_OUTDIR)/AUTORUN.INF \
    278         $(RePackScriptsAddResources_0_OUTDIR)/NT3xReadme.txt
    279 
    280 INSTALLS += RePackScriptsAddResourcesLanguages
    281 RePackScriptsAddResourcesLanguages_TEMPLATE = DUMMY
    282 RePackScriptsAddResourcesLanguages_INST = repack/add/resources/Languages/
    283 RePackScriptsAddResourcesLanguages_INSTTYPE = stage
    284 RePackScriptsAddResourcesLanguages_SOURCES = \
    285         $(RePackScriptsAddResourcesLanguages_0_OUTDIR)/English.nsh \
    286         $(RePackScriptsAddResourcesLanguages_0_OUTDIR)/French.nsh \
    287         $(RePackScriptsAddResourcesLanguages_0_OUTDIR)/German.nsh
    288 
     252RePackScriptsAdd_CLEAN = \
     253        $(RePackScriptsAdd_0_OUTDIR)/sign-ev.cmd
    289254
    290255$(call VBOX_EDIT_VERSION_AND_BUILD_RULE_FN,RePackScriptsAdd,../../../Installer/win/Scripts/PackDriversForSubmission.cmd,PackDriversForSubmission.cmd)
    291256$(call VBOX_EDIT_VERSION_AND_BUILD_RULE_FN,RePackScriptsAdd,../../../Installer/win/Scripts/Combined-1-Prepare.cmd,Combined-1-Prepare.cmd)
    292257$(call VBOX_EDIT_VERSION_AND_BUILD_RULE_FN,RePackScriptsAdd,../../../Installer/win/Scripts/Combined-3-RepackAdditions.cmd,Combined-3-RepackAdditions.cmd)
    293 
    294 $$(RePackScriptsAdd_0_OUTDIR)/UnpackBlessedDrivers.cmd: $(PATH_SUB_CURRENT)/../../../Installer/win/Scripts/UnpackBlessedDrivers.cmd | $$(dir $$@)
    295         $(CP) -f $< $@
    296258
    297259$$(RePackScriptsAdd_0_OUTDIR)/sign-ev.cmd: | $$(dir $$@)
    … …  
    307269                ) )
    308270
    309 $$(RePackScriptsAddResources_0_OUTDIR)/welcome.bmp: $(PATH_SUB_CURRENT)/welcome.bmp | $$(dir $$@)
    310         $(CP) -f $< $@
    311 
    312 $$(RePackScriptsAddResources_0_OUTDIR)/VirtualBoxGA-vista.ico: $(VBOX_WINDOWS_ADDITIONS_ICON_FILE) | $$(dir $$@)
    313         $(CP) -f $< $@
    314 
    315 $$(RePackScriptsAddResources_0_OUTDIR)/VirtualBoxGA-nsis.ico: $(VBOX_NSIS_ICON_FILE) | $$(dir $$@)
    316         $(CP) -f $< $@
    317 
    318 $$(RePackScriptsAddResources_0_OUTDIR)/iexplore.ico:  $(PATH_SUB_CURRENT)/iexplore.ico | $$(dir $$@)
    319         $(CP) -f $< $@
    320 
    321 $$(RePackScriptsAddResources_0_OUTDIR)/License-gpl-2.0.rtf : $(PATH_ROOT)/doc/License-gpl-2.0.rtf | $$(dir $$@)
    322         $(CP) -f $< $@
    323 
    324 $$(RePackScriptsAddResources_0_OUTDIR)/VBoxGuestAdditions.nsi: $(PATH_SUB_CURRENT)/VBoxGuestAdditions.nsi | $$(dir $$@)
    325         $(CP) -f $< $@
    326 
    327 $$(RePackScriptsAddResources_0_OUTDIR)/dumplog.nsh: $(PATH_SUB_CURRENT)/dumplog.nsh | $$(dir $$@)
    328         $(CP) -f $< $@
    329 
    330 $$(RePackScriptsAddResources_0_OUTDIR)/ReplaceDLL.nsh: $(PATH_SUB_CURRENT)/ReplaceDLL.nsh | $$(dir $$@)
    331         $(CP) -f $< $@
    332 
    333 $$(RePackScriptsAddResources_0_OUTDIR)/servicepack.nsh: $(PATH_SUB_CURRENT)/servicepack.nsh | $$(dir $$@)
    334         $(CP) -f $< $@
    335 
    336 $$(RePackScriptsAddResources_0_OUTDIR)/strstr.nsh: $(PATH_SUB_CURRENT)/strstr.nsh | $$(dir $$@)
    337         $(CP) -f $< $@
    338 
    339 $$(RePackScriptsAddResources_0_OUTDIR)/VBoxGuestAdditionsCommon.nsh: $(PATH_SUB_CURRENT)/VBoxGuestAdditionsCommon.nsh | $$(dir $$@)
    340         $(CP) -f $< $@
    341 
    342 $$(RePackScriptsAddResources_0_OUTDIR)/VBoxGuestAdditionsExternal.nsh: $(PATH_SUB_CURRENT)/VBoxGuestAdditionsExternal.nsh | $$(dir $$@)
    343         $(CP) -f $< $@
    344 
    345 $$(RePackScriptsAddResources_0_OUTDIR)/VBoxGuestAdditionsLog.nsh: $(PATH_SUB_CURRENT)/VBoxGuestAdditionsLog.nsh | $$(dir $$@)
    346         $(CP) -f $< $@
    347 
    348 $$(RePackScriptsAddResources_0_OUTDIR)/VBoxGuestAdditionsNT4.nsh: $(PATH_SUB_CURRENT)/VBoxGuestAdditionsNT4.nsh | $$(dir $$@)
    349         $(CP) -f $< $@
    350 
    351 $$(RePackScriptsAddResources_0_OUTDIR)/VBoxGuestAdditionsUninstall.nsh: $(PATH_SUB_CURRENT)/VBoxGuestAdditionsUninstall.nsh | $$(dir $$@)
    352         $(CP) -f $< $@
    353 
    354 $$(RePackScriptsAddResources_0_OUTDIR)/VBoxGuestAdditionsUninstallOld.nsh: $(PATH_SUB_CURRENT)/VBoxGuestAdditionsUninstallOld.nsh | $$(dir $$@)
    355         $(CP) -f $< $@
    356 
    357 $$(RePackScriptsAddResources_0_OUTDIR)/VBoxGuestAdditionsVista.nsh: $(PATH_SUB_CURRENT)/VBoxGuestAdditionsVista.nsh | $$(dir $$@)
    358         $(CP) -f $< $@
    359 
    360 $$(RePackScriptsAddResources_0_OUTDIR)/VBoxGuestAdditionsW2KXP.nsh: $(PATH_SUB_CURRENT)/VBoxGuestAdditionsW2KXP.nsh | $$(dir $$@)
    361         $(CP) -f $< $@
    362 
    363 $$(RePackScriptsAddResources_0_OUTDIR)/winver.nsh: $(PATH_SUB_CURRENT)/winver.nsh | $$(dir $$@)
    364         $(CP) -f $< $@
    365 
    366 $$(RePackScriptsAddResources_0_OUTDIR)/AUTORUN.INF: $(PATH_SUB_CURRENT)/ISO/AUTORUN.INF | $$(dir $$@)
    367         $(CP) -f $< $@
    368 
    369 $$(RePackScriptsAddResources_0_OUTDIR)/NT3xReadme.txt: $(PATH_SUB_CURRENT)/ISO/NT3xReadme.txt | $$(dir $$@)
    370         $(CP) -f $< $@
    371 
    372 $$(RePackScriptsAddResourcesLanguages_0_OUTDIR)/English.nsh: $(PATH_SUB_CURRENT)/Languages/English.nsh | $$(dir $$@)
    373         $(CP) -f $< $@
    374 
    375 $$(RePackScriptsAddResourcesLanguages_0_OUTDIR)/French.nsh: $(PATH_SUB_CURRENT)/Languages/French.nsh | $$(dir $$@)
    376         $(CP) -f $< $@
    377 
    378 $$(RePackScriptsAddResourcesLanguages_0_OUTDIR)/German.nsh: $(PATH_SUB_CURRENT)/Languages/German.nsh | $$(dir $$@)
    379         $(CP) -f $< $@
    380 
     271#
     272# Repacking resources.
     273#
     274INSTALLS += RePackScriptsAddResources
     275RePackScriptsAddResources_TEMPLATE = DUMMY
     276RePackScriptsAddResources_INST = repack/add/resources/
     277RePackScriptsAddResources_INSTTYPE = stage
     278RePackScriptsAddResources_SOURCES = \
     279        welcome.bmp \
     280        $(VBOX_WINDOWS_ADDITIONS_ICON_FILE)=>VirtualBoxGA-vista.ico \
     281        $(VBOX_NSIS_ICON_FILE)=>VirtualBoxGA-nsis.ico \
     282        iexplore.ico \
     283        $(PATH_ROOT)/doc/License-gpl-2.0.rtf \
     284        VBoxGuestAdditions.nsi \
     285        dumplog.nsh \
     286        ReplaceDLL.nsh \
     287        servicepack.nsh \
     288        strstr.nsh \
     289        VBoxGuestAdditionsCommon.nsh \
     290        VBoxGuestAdditionsExternal.nsh \
     291        VBoxGuestAdditionsLog.nsh\
     292        VBoxGuestAdditionsNT4.nsh \
     293        VBoxGuestAdditionsUninstall.nsh \
     294        VBoxGuestAdditionsUninstallOld.nsh \
     295        VBoxGuestAdditionsVista.nsh\
     296        VBoxGuestAdditionsW2KXP.nsh\
     297        winver.nsh \
     298        ISO/AUTORUN.INF \
     299        ISO/NT3xReadme.txt \
     300       \
     301        Languages/English.nsh=>Languages/English.nsh \
     302        Languages/French.nsh=>Languages/French.nsh \
     303        Languages/German.nsh=>Languages/German.nsh
    381304
    382305
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette