wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

bug 439050, change the build hooks from make-jars.pl over to JarMaker.py, r=ted

Browse Source
This commit is contained in:
Axel Hecht 2008-09-19 18:19:52 +02:00
parent f467cdbc82
commit 02e7a4b5b6
2 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
config/config.mk
View File

@ -434,30 +434,14 @@ endif
# Flags passed to make-jars.pl
MAKE_JARS_FLAGS = \
-s $(srcdir) -t $(topsrcdir) -z $(ZIP) -p $(MOZILLA_DIR)/config/preprocessor.pl \
-t $(topsrcdir) \
-f $(MOZ_CHROME_FILE_FORMAT) \
$(NULL)
ifdef NO_JAR_AUTO_REG
MAKE_JARS_FLAGS += -a
endif
ifdef USE_EXTENSION_MANIFEST
MAKE_JARS_FLAGS += -e
endif
ifeq ($(OS_TARGET),WIN95)
MAKE_JARS_FLAGS += -l
endif
ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT)))
MAKE_JARS_FLAGS += -x
endif
ifdef CROSS_COMPILE
MAKE_JARS_FLAGS += -o $(OS_ARCH)
endif
TAR_CREATE_FLAGS = -cvhf
ifeq ($(OS_ARCH),BSD_OS)

10
config/rules.mk
View File

@ -1796,12 +1796,10 @@ ifndef NO_DIST_INSTALL
@$(EXIT_ON_ERROR) \
if test -f $(JAR_MANIFEST); then \
if test ! -d $(FINAL_TARGET)/chrome; then $(NSINSTALL) -D $(FINAL_TARGET)/chrome; fi; \
if test ! -d $(MAKE_JARS_TARGET)/chrome; then $(NSINSTALL) -D $(MAKE_JARS_TARGET)/chrome; fi; \
$(PYTHON) $(MOZILLA_DIR)/config/Preprocessor.py $(XULPPFLAGS) $(DEFINES) $(ACDEFINES) \
$(JAR_MANIFEST) | \
$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-jars.pl \
$(QUIET) -d $(MAKE_JARS_TARGET)/chrome -j $(FINAL_TARGET)/chrome \
$(MAKE_JARS_FLAGS) -- "$(XULPPFLAGS) $(DEFINES) $(ACDEFINES)"; \
$(PYTHON) $(MOZILLA_DIR)/config/JarMaker.py \
$(QUIET) -j $(FINAL_TARGET)/chrome \
$(MAKE_JARS_FLAGS) $(XULPPFLAGS) $(DEFINES) $(ACDEFINES) \
$(JAR_MANIFEST); \
fi
endif