Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-23 10:54:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use detected versions of MAKE & ZIP.

Browse Source 
Start searching for tools in win32 builds but disable system makedepend.
Bug #201150 r=bryner
This commit is contained in:
seawood%netscape.com 2003-04-13 05:20:20 +00:00
parent 3855c654eb
commit 76ea08aa57
6 changed files with 555 additions and 487 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/autoconf.mk.in
View File

@ -247,6 +247,7 @@ ZIP = @ZIP@
XARGS = @XARGS@
STRIP = @STRIP@
DOXYGEN = @DOXYGEN@
MAKE = @MAKE@
ifdef MOZ_NATIVE_JPEG
JPEG_CFLAGS = @JPEG_CFLAGS@

33
config/make-jars.pl
View File

@ -1,6 +1,6 @@
#!/perl
# make-jars [-f] [-v] [-l] [-d <chromeDir>] [-s <srcdir>] < <jar.mn>
# make-jars [-f] [-v] [-l] [-x] [-d <chromeDir>] [-s <srcdir>] [-z zipprog] < <jar.mn>
my $cygwin_mountprefix = "";
if ($^O eq "cygwin") {
@ -31,7 +31,7 @@ import mozLock;
my $objdir = getcwd;
getopts("d:s:f:avlD:p:x");
getopts("d:s:f:avlD:p:xz:");
my $baseFilesDir = ".";
if (defined($::opt_s)) {
@ -90,6 +90,16 @@ if (defined($::opt_x)) {
$force_x11 = 1;
}
my $zipprog = $ENV{ZIP};
if (defined($::opt_z)) {
$zipprog = $::opt_z;
}
if ($zipprog eq "") {
print "A valid zip program must be given via the -z option or the ZIP environment variable. Exiting.\n";
exit(1);
}
my $defines = "";
while (@ARGV) {
$defines = "$defines ".shift(@ARGV);
@ -98,6 +108,7 @@ while (@ARGV) {
if ($verbose) {
print "make-jars "
. "-v -d $chromeDir "
. "-z $zipprog "
. ($fileformat ? "-f $fileformat " : "")
. ($nofilelocks ? "-l " : "")
. ($baseFilesDir ? "-s $baseFilesDir " : "")
@ -164,7 +175,7 @@ sub JarIt
my $cwd = getcwd;
my $err = 0;
#print "zip $zipmoveopt -u ../$jarfile.jar $args\n";
#print "$zipprog $zipmoveopt -u ../$jarfile.jar $args\n";
# Handle posix cmdline limits
while (length($args) > $maxCmdline) {
@ -174,15 +185,15 @@ sub JarIt
$subargs = substr($args, 0, $pos);
$args = substr($args, $pos);
#print "zip $zipmoveopt -u ../$jarfile.jar $subargs\n";
#print "$zipprog $zipmoveopt -u ../$jarfile.jar $subargs\n";
#print "Length of subargs: " . length($subargs) . "\n";
system("zip $zipmoveopt -u ../$jarfile.jar $subargs") == 0 or
system("$zipprog $zipmoveopt -u ../$jarfile.jar $subargs") == 0 or
$err = $? >> 8;
zipErrorCheck($err,$lockfile);
}
#print "Length of args: " . length($args) . "\n";
#print "zip $zipmoveopt -u ../$jarfile.jar $args\n";
system("zip $zipmoveopt -u ../$jarfile.jar $args") == 0 or
#print "$zipprog $zipmoveopt -u ../$jarfile.jar $args\n";
system("$zipprog $zipmoveopt -u ../$jarfile.jar $args") == 0 or
$err = $? >> 8;
zipErrorCheck($err,$lockfile);
}
@ -198,15 +209,15 @@ sub JarIt
$subargs = substr($overrides, 0, $pos);
$overrides = substr($overrides, $pos);
#print "zip $zipmoveopt ../$jarfile.jar $subargs\n";
#print "$zipprog $zipmoveopt ../$jarfile.jar $subargs\n";
#print "Length of subargs: " . length($subargs) . "\n";
system("zip $zipmoveopt ../$jarfile.jar $subargs") == 0 or
system("$zipprog $zipmoveopt ../$jarfile.jar $subargs") == 0 or
$err = $? >> 8;
zipErrorCheck($err,$lockfile);
}
#print "Length of args: " . length($overrides) . "\n";
#print "zip $zipmoveopt ../$jarfile.jar $overrides\n";
system("zip $zipmoveopt ../$jarfile.jar $overrides\n") == 0 or
#print "$zipprog $zipmoveopt ../$jarfile.jar $overrides\n";
system("$zipprog $zipmoveopt ../$jarfile.jar $overrides\n") == 0 or
$err = $? >> 8;
zipErrorCheck($err,$lockfile);
}

9
config/rules.mk
View File

@ -1046,7 +1046,6 @@ if test -d $(@D); then \
fi
endef
endif # WINNT
endif # !COMPILER_DEPEND
endif # MOZ_AUTO_DEPS
@ -1494,9 +1493,9 @@ endif
libs chrome:: $(CHROME_DEPS)
ifndef NO_DIST_INSTALL
ifdef MOZ_PHOENIX
@if test -f $(JAR_MANIFEST); then $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-jars.pl $(if $(filter gtk gtk2 xlib,$(MOZ_WIDGET_TOOLKIT)),-x) $(_NO_FLOCK) $(_JAR_AUTO_REG) -f $(MOZ_CHROME_FILE_FORMAT) -d $(DIST)/bin/chrome -s $(srcdir) -p $(MOZILLA_DIR)/config/preprocessor.pl -- "$(DEFINES) $(ACDEFINES)" < $(JAR_MANIFEST); fi
@if test -f $(JAR_MANIFEST); then $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-jars.pl $(if $(filter gtk gtk2 xlib,$(MOZ_WIDGET_TOOLKIT)),-x) $(_NO_FLOCK) $(_JAR_AUTO_REG) -f $(MOZ_CHROME_FILE_FORMAT) -d $(DIST)/bin/chrome -s $(srcdir) -z $(ZIP) -p $(MOZILLA_DIR)/config/preprocessor.pl -- "$(DEFINES) $(ACDEFINES)" < $(JAR_MANIFEST); fi
else
@if test -f $(JAR_MANIFEST); then $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-jars.pl $(if $(filter gtk gtk2 xlib,$(MOZ_WIDGET_TOOLKIT)),-x) $(_NO_FLOCK) $(_JAR_AUTO_REG) -f $(MOZ_CHROME_FILE_FORMAT) -d $(DIST)/bin/chrome -s $(srcdir) < $(JAR_MANIFEST); fi
@if test -f $(JAR_MANIFEST); then $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-jars.pl $(if $(filter gtk gtk2 xlib,$(MOZ_WIDGET_TOOLKIT)),-x) $(_NO_FLOCK) $(_JAR_AUTO_REG) -f $(MOZ_CHROME_FILE_FORMAT) -d $(DIST)/bin/chrome -s $(srcdir) -z $(ZIP) < $(JAR_MANIFEST); fi
endif
@if test -f $(JAR_MANIFEST); then $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-chromelist.pl $(DIST)/bin/chrome $(JAR_MANIFEST) $(_NO_FLOCK); fi
endif
@ -1504,9 +1503,9 @@ endif
install:: $(CHROME_DEPS)
ifndef NO_INSTALL
ifdef MOZ_PHOENIX
@if test -f $(JAR_MANIFEST); then $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-jars.pl $(if $(filter gtk gtk2 xlib,$(MOZ_WIDGET_TOOLKIT)),-x) $(_NO_FLOCK) $(_JAR_AUTO_REG) -f $(MOZ_CHROME_FILE_FORMAT) -d $(DESTDIR)$(mozappdir)/chrome -s $(srcdir) -p $(MOZILLA_DIR)/config/preprocessor.pl -- "$(DEFINES) $(ACDEFINES)" < $(JAR_MANIFEST); fi
@if test -f $(JAR_MANIFEST); then $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-jars.pl $(if $(filter gtk gtk2 xlib,$(MOZ_WIDGET_TOOLKIT)),-x) $(_NO_FLOCK) $(_JAR_AUTO_REG) -f $(MOZ_CHROME_FILE_FORMAT) -d $(DESTDIR)$(mozappdir)/chrome -s $(srcdir) -z $(ZIP) -p $(MOZILLA_DIR)/config/preprocessor.pl -- "$(DEFINES) $(ACDEFINES)" < $(JAR_MANIFEST); fi
else
@if test -f $(JAR_MANIFEST); then $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-jars.pl $(if $(filter gtk gtk2 xlib,$(MOZ_WIDGET_TOOLKIT)),-x) $(_NO_FLOCK) $(_JAR_AUTO_REG) -f $(MOZ_CHROME_FILE_FORMAT) -d $(DESTDIR)$(mozappdir)/chrome -s $(srcdir) < $(JAR_MANIFEST); fi
@if test -f $(JAR_MANIFEST); then $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-jars.pl $(if $(filter gtk gtk2 xlib,$(MOZ_WIDGET_TOOLKIT)),-x) $(_NO_FLOCK) $(_JAR_AUTO_REG) -f $(MOZ_CHROME_FILE_FORMAT) -d $(DESTDIR)$(mozappdir)/chrome -s $(srcdir) -z $(ZIP) < $(JAR_MANIFEST); fi
endif
@if test -f $(JAR_MANIFEST); then $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-chromelist.pl $(DESTDIR)$(mozappdir)/chrome $(JAR_MANIFEST) $(_NO_FLOCK); fi
endif

973
configure vendored
View File

File diff suppressed because it is too large Load Diff

22
configure.in
View File

@ -387,7 +387,6 @@ AC_SUBST(GNU_LD)
AC_SUBST(GNU_CC)
AC_SUBST(GNU_CXX)
if test -z "$SKIP_PATH_CHECKS"; then
dnl ========================================================
dnl Checks for programs.
dnl ========================================================
@ -396,7 +395,7 @@ AC_PROG_CXXCPP
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_AWK
AC_CHECK_PROGS(PERL, $PERL perl5 perl )
AC_PATH_PROGS(PERL, $PERL perl5 perl )
if test -z "$PERL" || test "$PERL" = ":"; then
AC_MSG_ERROR([perl not found in \$PATH])
fi
@ -435,7 +434,15 @@ if test -z "$XARGS" || test "$XARGS" = ":"; then
fi
dnl Be sure the make we use is GNU make.
AC_PATH_PROGS(MAKE, gmake make, :)
dnl on win32, gmake.exe is the generally the wrong version
case "$target_os" in
cygwin*|mingw*|mks*|msvc*)
AC_PATH_PROGS(MAKE, $MAKE make gmake, :)
;;
*)
AC_PATH_PROGS(MAKE, $MAKE gmake make, :)
;;
esac
_make_try=`$MAKE --version 2>/dev/null | grep GNU`
if test ! "$_make_try"
then
@ -458,6 +465,7 @@ if test "$_MAKE_MAJOR_VERSION" -lt "$MAKE_MAJOR_VERSION" || \
"$_MAKE_MINOR_VERSION" -lt "$MAKE_MINOR_VERSION"; then
AC_MSG_ERROR([GNU Make $MAKE_VERSION or higher is required to build Mozilla.])
fi
AC_SUBST(MAKE)
AC_PATH_XTRA
@ -468,8 +476,6 @@ fi
XCFLAGS="$X_CFLAGS"
fi # SKIP_PATH_CHECKS
dnl ========================================================
dnl set the defaults first
dnl ========================================================
@ -972,9 +978,6 @@ case "$target" in
_pwd=`pwd`
CYGWIN_WRAPPER="sh ${_pwd}/${srcdir}/build/cygwin-wrapper"
fi
if test -z "$PERL"; then
PERL=perl
fi
_WIN32_PERL=$PERL
if test "`${PERL} -v | grep -c cygwin 2>/dev/null`" != 0; then
PERL="${CYGWIN_WRAPPER} -up ${PERL}"
@ -984,6 +987,9 @@ case "$target" in
DSO_PIC_CFLAGS=
DLL_SUFFIX=.dll
RC='$(CYGWIN_WRAPPER) rc.exe'
# certain versions of cygwin's makedepend barf on the
# #include <string> vs -I./dist/include/string issue so don't use it
SYSTEM_MAKEDEPEND=
if test -n "$GNU_CC"; then
CC="$CC -mno-cygwin"
CXX="$CXX -mno-cygwin"

4
embedding/config/Makefile.in
View File

@ -58,10 +58,10 @@ else
b=`basename $$f | sed -e 's|.jar$$||'` ; \
echo "$$b" ; \
$(NSINSTALL) -D $(DIST)/Embed/tmpchrome/$$b ;\
unzip -o -d $(DIST)/Embed/tmpchrome/$$b $$f ; \
$(UNZIP) -o -d $(DIST)/Embed/tmpchrome/$$b $$f ; \
done
$(PERL) -I$(srcdir) $(srcdir)/gen_mn.pl -manifest $(MOZILLA_DIR)/embedding/config/embed-jar.mn -mozpath $(MOZILLA_DIR) -chrome $(DIST)/Embed/tmpchrome > $(MOZILLA_DIR)/embedding/config/embed-tmp.mn
$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-jars.pl -a -v -f $(MOZ_CHROME_FILE_FORMAT) -d $(DIST)/bin/chrome -s $(DIST)/Embed/tmpchrome < $(MOZILLA_DIR)/embedding/config/embed-tmp.mn
$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/make-jars.pl -a -v -f $(MOZ_CHROME_FILE_FORMAT) -d $(DIST)/bin/chrome -s $(DIST)/Embed/tmpchrome -z $(ZIP) < $(MOZILLA_DIR)/embedding/config/embed-tmp.mn
-$(RM) -f $(MOZILLA_DIR)/embedding/config/embed-tmp.mn
-$(RM) -rf $(DIST)/Embed/tmpchrome
endif