← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/firefox/gutsy

« back to all changes in this revision

Viewing changes to browser/installer/windows/Makefile.in

  • Committer: Bazaar Package Importer
  • Author(s): Ian Jackson
  • Date: 2006-10-10 18:49:32 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20061010184932-da75izt7y0e59afq
Tags: 1.99+2.0rc2+dfsg-0ubuntu1
* New upstream version 2.0rc2.
* Fix/workaround for epiphany GtkSocket lifetype crash:
  apply patch id=241087 from Mozilla Bugzilla #241535 to fix LP #63814.
* Change application name to `Firefox', as requested by mdz.
  Files changed:
    - browser/locales/en-US/chrome/branding/brand.dtd
    - browser/locales/en-US/chrome/branding/brand.properties;
  New values:
    - brandShortName and brandFullName: `Bon Echo' => `Firefox'
    - vendorShortName: `Mozilla' => `Ubuntu'
* Make preferences dialogue fit again (bah!).

Show diffs side-by-side

added added

removed removed

Lines of Context:
browser/installer/windows/Makefile.in
50
50
 
51
51
PP_LOCALIZED_FILES = \
52
52
        packages-static \
53
 
        installer.cfg \
54
53
        $(NULL)
55
54
 
56
55
INSTALLER_FILES = \
57
56
        app.tag \
58
57
        nsis/installer.nsi \
59
 
        nsis/SetProgramAccess.nsi \
 
58
        nsis/uninstaller.nsi \
60
59
        $(NULL)
61
60
 
62
61
BRANDING_FILES = \
63
62
        branding.nsi \
64
63
        wizHeader.bmp \
 
64
        wizHeader2.bmp \
 
65
        wizHeader3.bmp \
 
66
        wizHeader4.bmp \
65
67
        wizHeaderRTL.bmp \
66
68
        wizWatermark.bmp \
 
69
        wizWatermark2.bmp \
 
70
        wizWatermark3.bmp \
 
71
        wizWatermark4.bmp \
67
72
        $(NULL)
68
73
 
69
74
DEFINES += \
82
87
        $(MAKE) -C .. installer-stage
83
88
        $(MAKE) $(CONFIG_DIR)/setup.exe
84
89
 
 
90
# For building the uninstaller during the application build so it can be
 
91
# included for mar file generation.
 
92
uninstaller::
 
93
        $(RM) -rf $(CONFIG_DIR) && mkdir $(CONFIG_DIR)
 
94
        $(INSTALL) $(addprefix $(srcdir)/,$(INSTALLER_FILES)) $(CONFIG_DIR)
 
95
        $(INSTALL) $(addprefix $(DIST)/branding/,$(BRANDING_FILES)) $(CONFIG_DIR)
 
96
        $(EXIT_ON_ERROR) \
 
97
        for i in $(PP_LOCALIZED_FILES); do \
 
98
          $(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $(srcdir)/$$i > $(CONFIG_DIR)/$$i; \
 
99
        done
 
100
        $(PERL) $(topsrcdir)/config/preprocessor.pl -Fsubstitution $(DEFINES) $(ACDEFINES) \
 
101
          $(srcdir)/nsis/defines.nsi.in > $(CONFIG_DIR)/defines.nsi
 
102
        $(PERL) $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.pl \
 
103
          $(topsrcdir) $(call EXPAND_LOCALE_SRCDIR,browser/locales)/installer $(AB_CD) \
 
104
          $(WIN_INSTALLER_CHARSET) $(CONFIG_DIR)
 
105
 
85
106
$(CONFIG_DIR)/setup.exe::
86
107
        $(RM) -rf $(CONFIG_DIR) && mkdir $(CONFIG_DIR)
87
108
        $(INSTALL) $(addprefix $(srcdir)/,$(INSTALLER_FILES)) $(CONFIG_DIR)
88
109
        $(INSTALL) $(addprefix $(DIST)/branding/,$(BRANDING_FILES)) $(CONFIG_DIR)
89
 
        cp $(topsrcdir)/browser/EULA $(CONFIG_DIR)/license.txt
90
110
        cp $(topsrcdir)/browser/EULA.rtf $(CONFIG_DIR)/license.rtf
91
111
        $(EXIT_ON_ERROR) \
92
112
        for i in $(PP_LOCALIZED_FILES); do \
110
130
        cp $(srcdir)/Watermrk.bmp  $(DIST)/branding/Watermrk.bmp
111
131
        cp $(srcdir)/nsis/branding.nsi $(DIST)/branding/branding.nsi
112
132
        cp $(srcdir)/wizHeader.bmp     $(DIST)/branding/wizHeader.bmp
 
133
        cp $(srcdir)/wizHeader2.bmp    $(DIST)/branding/wizHeader2.bmp
 
134
        cp $(srcdir)/wizHeader3.bmp    $(DIST)/branding/wizHeader3.bmp
 
135
        cp $(srcdir)/wizHeader4.bmp    $(DIST)/branding/wizHeader4.bmp
113
136
        cp $(srcdir)/wizHeaderRTL.bmp  $(DIST)/branding/wizHeaderRTL.bmp
114
137
        cp $(srcdir)/wizWatermark.bmp  $(DIST)/branding/wizWatermark.bmp
 
138
        cp $(srcdir)/wizWatermark2.bmp $(DIST)/branding/wizWatermark2.bmp
 
139
        cp $(srcdir)/wizWatermark3.bmp $(DIST)/branding/wizWatermark3.bmp
 
140
        cp $(srcdir)/wizWatermark4.bmp $(DIST)/branding/wizWatermark4.bmp
115
141
endif