mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-24 03:19:06 +00:00
Bug 52701 - bringing MOZ_DISABLE_JAR_PACKAGING back to life.
This commit is contained in:
parent
da6e893eec
commit
6be2561bee
@ -2,14 +2,21 @@
|
||||
|
||||
# add-chrome <jar-file-name> <pkg-name> <chrome-type> <installed-chrome.txt-file>
|
||||
|
||||
my $jarFileName = $ARGV[0];
|
||||
my $pkgName = $ARGV[1];
|
||||
my $chromeType = $ARGV[2];
|
||||
my $installedChromeFile = $ARGV[3];
|
||||
my $installedChromeFile = $ARGV[0];
|
||||
my $chromeType = $ARGV[1];
|
||||
my $pkgName = $ARGV[2];
|
||||
my $jarFileName = $ARGV[3];
|
||||
my $disableJarPackaging = $ARGV[4];
|
||||
|
||||
#print "add-chrome $jarFileName $pkgName $chromeType $installedChromeFile\n";
|
||||
|
||||
my $line = "$chromeType,install,url,jar:resource:/chrome/$jarFileName!/";
|
||||
my $line;
|
||||
if ($disableJarPackaging) {
|
||||
$line = "$chromeType,install,url,resource:/chrome/$jarFileName/";
|
||||
}
|
||||
else {
|
||||
$line = "$chromeType,install,url,jar:resource:/chrome/$jarFileName.jar!/";
|
||||
}
|
||||
#coming...
|
||||
#my $line = "$chromeType,install,url,jar:resource:/chrome/$jarFileName!/$chromeType/$pkgName/";
|
||||
|
||||
|
@ -591,7 +591,7 @@ chrome::
|
||||
|
||||
install:: chrome
|
||||
|
||||
!ifndef MOZ_DISABLE_JAR_PACKAGING
|
||||
!ifndef MOZ_OLD_JAR_PACKAGING
|
||||
|
||||
!if exist($(JAR_MANIFEST))
|
||||
chrome::
|
||||
@ -600,12 +600,12 @@ chrome::
|
||||
|
||||
!if "$(CHROME_TYPE)" != "$(NULL)"
|
||||
chrome::
|
||||
-for %t in ($(CHROME_TYPE)) do @perl $(DEPTH)\config\add-chrome.pl $(CHROME_DIR:\=/).jar packageName %t $(DIST)\bin\chrome\installed-chrome.txt
|
||||
-for %t in ($(CHROME_TYPE)) do @perl $(DEPTH)\config\add-chrome.pl $(DIST)\bin\chrome\installed-chrome.txt %t packageName $(CHROME_DIR:\=/) $(MOZ_DISABLE_JAR_PACKAGING)
|
||||
!endif
|
||||
|
||||
regchrome:
|
||||
|
||||
!else # !MOZ_DISABLE_JAR_PACKAGING
|
||||
!else # !MOZ_OLD_JAR_PACKAGING
|
||||
|
||||
################################################################################
|
||||
# Generate chrome building rules.
|
||||
@ -764,7 +764,7 @@ regchrome:
|
||||
# $(PERL) $(DEPTH)\config\installchrome.pl win32 resource $(DIST)\bin\chrome
|
||||
!endif
|
||||
|
||||
!endif # !MOZ_DISABLE_JAR_PACKAGING
|
||||
!endif # !MOZ_OLD_JAR_PACKAGING
|
||||
|
||||
################################################################################
|
||||
|
||||
|
@ -31,112 +31,8 @@
|
||||
|
||||
DEPTH =..\..
|
||||
|
||||
include <$(DEPTH)\config\config.mak>
|
||||
|
||||
!ifdef MOZ_DISABLE_JAR_PACKAGING
|
||||
|
||||
DIRS = xul
|
||||
|
||||
JSLIBFILES = \
|
||||
.\js\lib\utils.js \
|
||||
.\js\lib\events.js \
|
||||
.\js\lib\connection-xpcom.js \
|
||||
.\js\lib\command-manager.js \
|
||||
.\js\lib\irc.js \
|
||||
.\js\lib\irc-debug.js \
|
||||
$(NULL)
|
||||
|
||||
XULLIBFILES = \
|
||||
.\xul\lib\listbox.js \
|
||||
.\xul\lib\munger.js \
|
||||
$(NULL)
|
||||
|
||||
CONTENTFILES = \
|
||||
.\xul\content\chatzilla.xul \
|
||||
.\xul\content\commands.js \
|
||||
.\xul\content\handlers.js \
|
||||
.\xul\content\readprefs.js \
|
||||
.\xul\content\static.js \
|
||||
.\xul\content\rdf.js \
|
||||
$(NULL)
|
||||
|
||||
SKINFILES = \
|
||||
.\xul\skin\chatzilla.css \
|
||||
.\xul\skin\output-default.css \
|
||||
.\xul\skin\output-loud.css \
|
||||
.\xul\skin\output-marble.css \
|
||||
$(NULL)
|
||||
|
||||
IMAGEFILES = \
|
||||
.\xul\skin\images\xtal.jpg \
|
||||
.\xul\skin\images\blue_rock.gif \
|
||||
.\xul\skin\images\face-frown.gif \
|
||||
.\xul\skin\images\face-tongue.gif \
|
||||
.\xul\skin\images\face-angry.gif \
|
||||
.\xul\skin\images\face-screw.gif \
|
||||
.\xul\skin\images\face-wink.gif \
|
||||
.\xul\skin\images\face-cry.gif \
|
||||
.\xul\skin\images\face-smile.gif \
|
||||
.\xul\skin\images\face-dunno.gif \
|
||||
.\xul\skin\images\face-surprise.gif \
|
||||
.\xul\skin\images\is-op.gif \
|
||||
.\xul\skin\images\isnt-op.gif \
|
||||
.\xul\skin\images\is-voice.gif \
|
||||
.\xul\skin\images\isnt-voice.gif \
|
||||
.\xul\skin\images\view-activity.gif \
|
||||
.\xul\skin\images\view-attention.gif \
|
||||
.\xul\skin\images\view-current.gif \
|
||||
.\xul\skin\images\view-normal.gif \
|
||||
$(NULL)
|
||||
|
||||
TESTFILES = \
|
||||
.\xul\tests\test3.xul \
|
||||
.\xul\tests\test3.css \
|
||||
.\xul\tests\test3-output-default.css \
|
||||
.\xul\tests\test3-output-marble.css \
|
||||
.\xul\tests\test3-output-loud.css \
|
||||
.\xul\tests\test3-static.js \
|
||||
.\xul\tests\test3-handlers.js \
|
||||
.\xul\tests\test3-commands.js \
|
||||
.\xul\tests\test3-readprefs.js \
|
||||
.\xul\tests\g_green.gif \
|
||||
.\xul\tests\g_green_on.gif \
|
||||
.\xul\tests\g_grey.gif \
|
||||
.\xul\tests\g_grey_on.gif \
|
||||
.\xul\tests\green-on.gif \
|
||||
.\xul\tests\green-off.gif \
|
||||
.\xul\tests\green-blink-1.gif \
|
||||
.\xul\tests\yellow-on.gif \
|
||||
.\xul\tests\xtal.jpg \
|
||||
.\xul\tests\blue_rock.gif \
|
||||
.\xul\tests\face-angry.gif \
|
||||
.\xul\tests\face-cry.gif \
|
||||
.\xul\tests\face-frown.gif \
|
||||
.\xul\tests\face-smile.gif \
|
||||
.\xul\tests\face-surprise.gif \
|
||||
.\xul\tests\face-tongue.gif \
|
||||
.\xul\tests\face-wink.gif \
|
||||
.\xul\tests\face-screw.gif \
|
||||
.\xul\tests\face-dunno.gif \
|
||||
$(NULL)
|
||||
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
||||
INSTALLROOT = $(DIST)\bin\chrome\packages\chatzilla\chatzilla
|
||||
|
||||
install::
|
||||
$(MAKE_INSTALL) $(JSLIBFILES) $(INSTALLROOT)\content\lib\js
|
||||
$(MAKE_INSTALL) $(XULLIBFILES) $(INSTALLROOT)\content\lib\xul
|
||||
$(MAKE_INSTALL) $(CONTENTFILES) $(INSTALLROOT)\content
|
||||
$(MAKE_INSTALL) $(SKINFILES) $(INSTALLROOT)\skin
|
||||
$(MAKE_INSTALL) $(IMAGEFILES) $(INSTALLROOT)\skin\images
|
||||
|
||||
!else
|
||||
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
||||
!endif
|
||||
|
||||
install::
|
||||
$(MAKE_INSTALL) .\js\lib\chatzilla-service.js $(DIST)\bin\components
|
||||
|
||||
|
@ -54,18 +54,3 @@ install:: $(LIBRARY)
|
||||
clobber::
|
||||
rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
|
||||
|
||||
!ifdef MOZ_DISABLE_JAR_PACKAGING
|
||||
|
||||
clobber::
|
||||
rm -f $(DIST)\bin\chrome\packages\core\communicator\content\wallet\CookieViewer.xul
|
||||
rm -f $(DIST)\bin\chrome\packages\core\communicator\content\wallet\CookieViewer.js
|
||||
rm -f $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet\CookieViewer.properties
|
||||
rm -f $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet\CookieViewer.dtd
|
||||
|
||||
install:: $(DLL)
|
||||
$(MAKE_INSTALL) CookieViewer.xul $(DIST)\bin\chrome\packages\core\communicator\content\wallet
|
||||
$(MAKE_INSTALL) CookieViewer.js $(DIST)\bin\chrome\packages\core\communicator\content\wallet
|
||||
$(MAKE_INSTALL) CookieViewer.properties $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet
|
||||
$(MAKE_INSTALL) CookieViewer.dtd $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet
|
||||
|
||||
!endif
|
||||
|
@ -54,48 +54,3 @@ install:: $(LIBRARY)
|
||||
clobber::
|
||||
rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
|
||||
|
||||
!ifdef MOZ_DISABLE_JAR_PACKAGING
|
||||
|
||||
clobber::
|
||||
rm -f $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet\interview.html
|
||||
rm -f $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet\index.html
|
||||
rm -f $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet\privacy.html
|
||||
rm -f $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet\sample1.html
|
||||
rm -f $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet\sample2.html
|
||||
rm -f $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet\sample3.html
|
||||
rm -f $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet\sample4.html
|
||||
rm -f $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet\sample5.html
|
||||
rm -f $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet\sample6.html
|
||||
rm -f $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet\sample7.html
|
||||
rm -f $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet\sample8.html
|
||||
rm -f $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet\sample9.html
|
||||
rm -f $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet\sample10.html
|
||||
rm -f $(DIST)\bin\chrome\packages\core\communicator\content\wallet\WalletEditor.xul
|
||||
rm -f $(DIST)\bin\chrome\packages\core\communicator\content\wallet\WalletEditor.js
|
||||
rm -f $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet\WalletEditor.properties
|
||||
rm -f $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet\WalletEditor.dtd
|
||||
rm -f $(DIST)\bin\chrome\packages\core\communicator\content\wallet\privacy.xul
|
||||
rm -f $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet\privacy.dtd
|
||||
|
||||
install:: $(DLL)
|
||||
$(MAKE_INSTALL) interview.html $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet
|
||||
$(MAKE_INSTALL) index.html $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet
|
||||
$(MAKE_INSTALL) privacy.html $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet
|
||||
$(MAKE_INSTALL) sample1.html $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet
|
||||
$(MAKE_INSTALL) sample2.html $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet
|
||||
$(MAKE_INSTALL) sample3.html $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet
|
||||
$(MAKE_INSTALL) sample4.html $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet
|
||||
$(MAKE_INSTALL) sample5.html $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet
|
||||
$(MAKE_INSTALL) sample6.html $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet
|
||||
$(MAKE_INSTALL) sample7.html $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet
|
||||
$(MAKE_INSTALL) sample8.html $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet
|
||||
$(MAKE_INSTALL) sample9.html $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet
|
||||
$(MAKE_INSTALL) sample10.html $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet
|
||||
$(MAKE_INSTALL) WalletEditor.xul $(DIST)\bin\chrome\packages\core\communicator\content\wallet
|
||||
$(MAKE_INSTALL) WalletEditor.js $(DIST)\bin\chrome\packages\core\communicator\content\wallet
|
||||
$(MAKE_INSTALL) WalletEditor.properties $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet
|
||||
$(MAKE_INSTALL) WalletEditor.dtd $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet
|
||||
$(MAKE_INSTALL) privacy.xul $(DIST)\bin\chrome\packages\core\communicator\content\wallet
|
||||
$(MAKE_INSTALL) privacy.dtd $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet
|
||||
|
||||
!endif
|
||||
|
@ -54,18 +54,3 @@ install:: $(LIBRARY)
|
||||
clobber::
|
||||
rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
|
||||
|
||||
!ifdef MOZ_DISABLE_JAR_PACKAGING
|
||||
|
||||
clobber::
|
||||
rm -f $(DIST)\bin\chrome\packages\core\communicator\content\wallet\SignonViewer.xul
|
||||
rm -f $(DIST)\bin\chrome\packages\core\communicator\content\wallet\SignonViewer.js
|
||||
rm -f $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet\SignonViewer.properties
|
||||
rm -f $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet\SignonViewer.dtd
|
||||
|
||||
install:: $(DLL)
|
||||
$(MAKE_INSTALL) SignonViewer.xul $(DIST)\bin\chrome\packages\core\communicator\content\wallet
|
||||
$(MAKE_INSTALL) SignonViewer.js $(DIST)\bin\chrome\packages\core\communicator\content\wallet
|
||||
$(MAKE_INSTALL) SignonViewer.properties $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet
|
||||
$(MAKE_INSTALL) SignonViewer.dtd $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet
|
||||
|
||||
!endif
|
||||
|
@ -54,16 +54,3 @@ install:: $(LIBRARY)
|
||||
clobber::
|
||||
rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
|
||||
|
||||
!ifdef MOZ_DISABLE_JAR_PACKAGING
|
||||
|
||||
clobber::
|
||||
rm -f $(DIST)\bin\chrome\packages\core\communicator\content\wallet\WalletPreview.xul
|
||||
rm -f $(DIST)\bin\chrome\packages\core\communicator\content\wallet\WalletPreview.js
|
||||
rm -f $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet\WalletPreview.properties
|
||||
|
||||
install:: $(DLL)
|
||||
$(MAKE_INSTALL) WalletPreview.xul $(DIST)\bin\chrome\packages\core\communicator\content\wallet
|
||||
$(MAKE_INSTALL) WalletPreview.js $(DIST)\bin\chrome\packages\core\communicator\content\wallet
|
||||
$(MAKE_INSTALL) WalletPreview.properties $(DIST)\bin\chrome\locales\en-US\communicator\locale\wallet
|
||||
|
||||
!endif
|
||||
|
@ -25,8 +25,4 @@ include <$(DEPTH)\config\config.mak>
|
||||
|
||||
DIRS=public src prefs build
|
||||
|
||||
!ifdef MOZ_DISABLE_JAR_PACKAGING
|
||||
DIRS=$(DIRS) resources
|
||||
!endif
|
||||
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
@ -21,10 +21,4 @@
|
||||
|
||||
DEPTH=..\..
|
||||
|
||||
include <$(DEPTH)\config\config.mak>
|
||||
|
||||
!ifdef MOZ_DISABLE_JAR_PACKAGING
|
||||
DIRS=content locale
|
||||
!endif
|
||||
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
@ -21,10 +21,4 @@
|
||||
|
||||
DEPTH=..\..\..
|
||||
|
||||
include <$(DEPTH)\config\config.mak>
|
||||
|
||||
!ifdef MOZ_DISABLE_JAR_PACKAGING
|
||||
DIRS=locale content
|
||||
!endif
|
||||
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
@ -22,10 +22,4 @@
|
||||
DEPTH=..\..
|
||||
MODULE=profile
|
||||
|
||||
include <$(DEPTH)\config\config.mak>
|
||||
|
||||
!ifdef MOZ_DISABLE_JAR_PACKAGING
|
||||
DIRS=locale content
|
||||
!endif
|
||||
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
@ -28,18 +28,5 @@ include <$(THEME_ROOT_DEPTH)\theme.mk>
|
||||
CHROME_TYPE = skin
|
||||
CHROME_DIR = skins\$(THEME)
|
||||
|
||||
!ifdef MOZ_DISABLE_JAR_PACKAGING
|
||||
|
||||
DIRS=communicator editor global messenger navigator
|
||||
|
||||
CHROME_MISC_DIR = .
|
||||
|
||||
CHROME_MISC = \
|
||||
.\manifest.rdf \
|
||||
.\preview.png \
|
||||
$(NULL)
|
||||
|
||||
!endif
|
||||
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
||||
|
@ -23,21 +23,3 @@ DEPTH = ..\..\..\..\..
|
||||
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
||||
!ifdef MOZ_DISABLE_JAR_PACKAGING
|
||||
|
||||
THEME_ROOT_DEPTH = ..\..\..
|
||||
|
||||
include <$(THEME_ROOT_DEPTH)\theme.mk>
|
||||
|
||||
clobber::
|
||||
rm -f $(DIST)\chrome\skins\$(THEME)\communicator\skin\search\win\*.*
|
||||
|
||||
install::
|
||||
$(MAKE_INSTALL) findresults.css $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin\search
|
||||
$(MAKE_INSTALL) icons.css $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin\search
|
||||
$(MAKE_INSTALL) internet.css $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin\search
|
||||
$(MAKE_INSTALL) internetresults.css $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin\search
|
||||
$(MAKE_INSTALL) search-editor.css $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin\search
|
||||
$(MAKE_INSTALL) search.css $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin\search
|
||||
|
||||
!endif
|
||||
|
@ -23,19 +23,3 @@ DEPTH = ..\..\..\..\..
|
||||
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
||||
!ifdef MOZ_DISABLE_JAR_PACKAGING
|
||||
|
||||
THEME_ROOT_DEPTH = ..\..\..
|
||||
|
||||
include <$(THEME_ROOT_DEPTH)\theme.mk>
|
||||
|
||||
clobber::
|
||||
rm -f $(DIST)\chrome\skins\$(THEME)\communicator\skin\sidebar\*.*
|
||||
|
||||
install::
|
||||
$(MAKE_INSTALL) customize.css $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin\sidebar
|
||||
$(MAKE_INSTALL) preview.css $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin\sidebar
|
||||
$(MAKE_INSTALL) sidebar.css $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin\sidebar
|
||||
$(MAKE_INSTALL) sidebarBindings.xml $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin\sidebar
|
||||
|
||||
!endif
|
||||
|
@ -22,26 +22,3 @@
|
||||
DEPTH = ..\..\..\..
|
||||
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
||||
!ifdef MOZ_DISABLE_JAR_PACKAGING
|
||||
|
||||
THEME_ROOT_DEPTH = ..\..
|
||||
|
||||
include <$(THEME_ROOT_DEPTH)\theme.mk>
|
||||
|
||||
install::
|
||||
$(MAKE_INSTALL) box.css $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin
|
||||
$(MAKE_INSTALL) brand.css $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin
|
||||
$(MAKE_INSTALL) button.css $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin
|
||||
$(MAKE_INSTALL) communicator.css $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin
|
||||
$(MAKE_INSTALL) formatting.css $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin
|
||||
$(MAKE_INSTALL) menubutton.css $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin
|
||||
$(MAKE_INSTALL) toolbar.css $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin
|
||||
$(MAKE_INSTALL) dialogOverlay.css $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin
|
||||
$(MAKE_INSTALL) tasksOverlay.css $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin
|
||||
$(MAKE_INSTALL) search-widgets.css $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin
|
||||
|
||||
clobber::
|
||||
rm -f $(DIST)\chrome\$(THEME)\communicator\skin\*.*
|
||||
|
||||
!endif
|
||||
|
@ -23,46 +23,3 @@ DEPTH = ..\..\..\..
|
||||
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
||||
!ifdef MOZ_DISABLE_JAR_PACKAGING
|
||||
|
||||
THEME_ROOT_DEPTH = ..\..
|
||||
|
||||
include <$(THEME_ROOT_DEPTH)\theme.mk>
|
||||
|
||||
clobber::
|
||||
rm -f $(DIST)\chrome\skins\$(THEME)\global\skin\*.*
|
||||
|
||||
install::
|
||||
$(MAKE_INSTALL) box.css $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
$(MAKE_INSTALL) button.css $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
$(MAKE_INSTALL) checkbox.css $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
$(MAKE_INSTALL) colorpicker.css $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
$(MAKE_INSTALL) commonDialog.css $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
$(MAKE_INSTALL) console.css $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
$(MAKE_INSTALL) filepicker.css $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
$(MAKE_INSTALL) formatting.css $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
$(MAKE_INSTALL) global.css $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
$(MAKE_INSTALL) menu.css $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
$(MAKE_INSTALL) menubutton.css $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
$(MAKE_INSTALL) menulist.css $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
$(MAKE_INSTALL) radio.css $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
$(MAKE_INSTALL) scrollbars.css $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
$(MAKE_INSTALL) splitter.css $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
$(MAKE_INSTALL) tabcontrol.css $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
$(MAKE_INSTALL) textfield.css $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
$(MAKE_INSTALL) toolbar.css $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
$(MAKE_INSTALL) tree.css $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
$(MAKE_INSTALL) wizardOverlay.css $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
$(MAKE_INSTALL) tabBindings.xml $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
$(MAKE_INSTALL) buttonBindings.xml $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
$(MAKE_INSTALL) classicBindings.xml $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
$(MAKE_INSTALL) menulistBindings.xml $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
$(MAKE_INSTALL) treeBindings.xml $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
$(MAKE_INSTALL) scrollbar-slider-bg.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
$(MAKE_INSTALL) error-icon.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
$(MAKE_INSTALL) message-icon.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
$(MAKE_INSTALL) question-icon.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
$(MAKE_INSTALL) alert-icon.gif $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
$(MAKE_INSTALL) dialogOverlay.css $(DIST)\bin\chrome\skins\$(THEME)\global\skin
|
||||
|
||||
!endif
|
||||
|
@ -28,25 +28,6 @@ include <$(THEME_ROOT_DEPTH)\theme.mk>
|
||||
CHROME_TYPE = skin
|
||||
CHROME_DIR = skins\$(THEME)
|
||||
|
||||
!ifdef MOZ_DISABLE_JAR_PACKAGING
|
||||
|
||||
DIRS=communicator editor global messenger navigator
|
||||
|
||||
CHROME_MISC_DIR = .
|
||||
|
||||
CHROME_MISC = \
|
||||
.\manifest.rdf \
|
||||
.\preview\win\preview.png \
|
||||
$(NULL)
|
||||
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
||||
# choose Classic skin as default
|
||||
chrome::
|
||||
echo skin,install,select,classic/1.0 >>$(DIST)\bin\chrome\installed-chrome.txt
|
||||
|
||||
!else
|
||||
|
||||
DIRS = communicator\search\win \
|
||||
communicator\sidebar\win \
|
||||
communicator\win \
|
||||
@ -55,5 +36,3 @@ DIRS = communicator\search\win \
|
||||
navigator\win
|
||||
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
||||
!endif
|
||||
|
@ -28,17 +28,4 @@ include <$(THEME_ROOT_DEPTH)\theme.mk>
|
||||
CHROME_TYPE = skin
|
||||
CHROME_DIR = skins\$(THEME)
|
||||
|
||||
!ifdef MOZ_DISABLE_JAR_PACKAGING
|
||||
|
||||
DIRS=communicator editor global messenger navigator
|
||||
|
||||
CHROME_MISC_DIR = .
|
||||
|
||||
CHROME_MISC = \
|
||||
.\manifest.rdf \
|
||||
.\preview.png \
|
||||
$(NULL)
|
||||
|
||||
!endif
|
||||
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
Loading…
x
Reference in New Issue
Block a user