зеркало из https://github.com/mozilla/pjs.git
Bug 82268, Builds use wrong version of perl
r=Christophe,nelson
This commit is contained in:
neil.williams%sun.com
Родитель
afd85cc820
Коммит
c17c4881d9
|
|
@ -47,6 +47,7 @@ LINK_DLL = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS)
|
|||
LINK_EXE = $(LINK) $(OS_LFLAGS) $(LFLAGS)
|
||||
CFLAGS = $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \
|
||||
$(XCFLAGS)
|
||||
PERL = perl
|
||||
RANLIB = echo
|
||||
TAR = /bin/tar
|
||||
#
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@ endif
|
|||
|
||||
import::
|
||||
@echo "== import.pl =="
|
||||
@perl -I$(CORE_DEPTH)/coreconf $(CORE_DEPTH)/coreconf/import.pl \
|
||||
@$(PERL) -I$(CORE_DEPTH)/coreconf $(CORE_DEPTH)/coreconf/import.pl \
|
||||
"RELEASE_TREE=$(RELEASE_TREE)" \
|
||||
"IMPORTS=$(IMPORTS)" \
|
||||
"VERSION=$(VERSION)" \
|
||||
|
|
@ -159,7 +159,7 @@ release:: release_clean release_export release_classes release_policy release_md
|
|||
|
||||
release_cpdistdir::
|
||||
@echo "== cpdist.pl =="
|
||||
@perl -I$(CORE_DEPTH)/coreconf $(CORE_DEPTH)/coreconf/cpdist.pl \
|
||||
@$(PERL) -I$(CORE_DEPTH)/coreconf $(CORE_DEPTH)/coreconf/cpdist.pl \
|
||||
"RELEASE_TREE=$(RELEASE_TREE)" \
|
||||
"CORE_DEPTH=$(CORE_DEPTH)" \
|
||||
"MODULE=${MODULE}" \
|
||||
|
|
@ -185,7 +185,7 @@ release_cpdistdir::
|
|||
|
||||
release_jars::
|
||||
@echo "== release.pl =="
|
||||
@perl -I$(CORE_DEPTH)/coreconf $(CORE_DEPTH)/coreconf/release.pl \
|
||||
@$(PERL) -I$(CORE_DEPTH)/coreconf $(CORE_DEPTH)/coreconf/release.pl \
|
||||
"RELEASE_TREE=$(RELEASE_TREE)" \
|
||||
"PLATFORM=$(PLATFORM)" \
|
||||
"OS_ARCH=$(OS_ARCH)" \
|
||||
|
|
@ -584,7 +584,7 @@ ifdef NETLIBDEPTH
|
|||
CORE_DEPTH := $(NETLIBDEPTH)
|
||||
endif
|
||||
|
||||
JAVA_EXPORT_SRCS=$(shell perl $(CORE_DEPTH)/coreconf/outofdate.pl $(PERLARG) -d $(JAVA_DESTPATH)/$(PACKAGE) $(JSRCS) $(PRIVATE_JSRCS))
|
||||
JAVA_EXPORT_SRCS=$(shell $(PERL) $(CORE_DEPTH)/coreconf/outofdate.pl $(PERLARG) -d $(JAVA_DESTPATH)/$(PACKAGE) $(JSRCS) $(PRIVATE_JSRCS))
|
||||
|
||||
export:: $(JAVA_DESTPATH) $(JAVA_DESTPATH)/$(PACKAGE)
|
||||
ifneq ($(JAVA_EXPORT_SRCS),)
|
||||
|
|
@ -627,7 +627,7 @@ export:: $(JAVA_DESTPATH) $(JAVA_DESTPATH)/$(PACKAGE)
|
|||
if test -d $$d; then \
|
||||
set $(EXIT_ON_ERROR); \
|
||||
files=`echo $$d/*.java`; \
|
||||
list=`perl $(CORE_DEPTH)/coreconf/outofdate.pl $(PERLARG) \
|
||||
list=`$(PERL) $(CORE_DEPTH)/coreconf/outofdate.pl $(PERLARG) \
|
||||
-d $(JAVA_DESTPATH)/$(PACKAGE) $$files`; \
|
||||
if test "$${list}x" != "x"; then \
|
||||
echo Building all java files in $$d; \
|
||||
|
|
@ -756,7 +756,7 @@ export::
|
|||
$(JAVAH) -jni -d $(JNI_GEN_DIR) $(JNI_GEN); \
|
||||
else \
|
||||
echo "Checking for out of date header files" ; \
|
||||
perl $(CORE_DEPTH)/coreconf/jniregen.pl $(PERLARG) \
|
||||
$(PERL) $(CORE_DEPTH)/coreconf/jniregen.pl $(PERLARG) \
|
||||
-d $(JAVA_DESTPATH) -j "$(JAVAH) -jni -d $(JNI_GEN_DIR)" $(JNI_GEN);\
|
||||
fi
|
||||
endif
|
||||
|
|
@ -855,7 +855,7 @@ TESTS_DIR = $(RESULTS_DIR)/$(RESULTS_SUBDIR)/$(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)
|
|||
ifneq ($(REGRESSION_SPEC),)
|
||||
|
||||
ifneq ($(BUILD_OPT),)
|
||||
REGDATE = $(subst \ ,, $(shell perl $(CORE_DEPTH)/$(MODULE)/scripts/now))
|
||||
REGDATE = $(subst \ ,, $(shell $(PERL) $(CORE_DEPTH)/$(MODULE)/scripts/now))
|
||||
endif
|
||||
|
||||
tests:: $(REGRESSION_SPEC)
|
||||
|
|
@ -931,7 +931,7 @@ PERL_DEPENDENCIES_PROGRAM = \
|
|||
}
|
||||
|
||||
.DEFAULT:
|
||||
@perl -e '$(PERL_DEPENDENCIES_PROGRAM)'
|
||||
@$(PERL) -e '$(PERL_DEPENDENCIES_PROGRAM)'
|
||||
endif
|
||||
|
||||
#############################################################################
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
# the terms of any one of the MPL, the GPL or the LGPL.
|
||||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
MAKEFILE_CVS_ID = "@(#) $RCSfile: Makefile,v $ $Revision: 1.12 $ $Date: 2007-05-08 01:31:23 $"
|
||||
MAKEFILE_CVS_ID = "@(#) $RCSfile: Makefile,v $ $Revision: 1.13 $ $Date: 2007-05-09 00:09:38 $"
|
||||
|
||||
include manifest.mn
|
||||
include $(CORE_DEPTH)/coreconf/config.mk
|
||||
|
|
@ -56,7 +56,7 @@ endif
|
|||
# nssckft.h: ck.api ckapi.perl
|
||||
# nssckg.h: ck.api ckapi.perl
|
||||
# nssck.api: ck.api ckapi.perl
|
||||
# perl ckapi.perl ck.api
|
||||
# $(PERL) ckapi.perl ck.api
|
||||
|
||||
export:: private_export
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
# the terms of any one of the MPL, the GPL or the LGPL.
|
||||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
MAKEFILE_CVS_ID = "@(#) $RCSfile: Makefile,v $ $Revision: 1.18 $ $Date: 2007-05-08 01:31:23 $"
|
||||
MAKEFILE_CVS_ID = "@(#) $RCSfile: Makefile,v $ $Revision: 1.19 $ $Date: 2007-05-09 00:09:38 $"
|
||||
|
||||
include manifest.mn
|
||||
include $(CORE_DEPTH)/coreconf/config.mk
|
||||
|
|
@ -77,7 +77,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
|||
|
||||
# Generate certdata.c.
|
||||
generate:
|
||||
perl certdata.perl < certdata.txt
|
||||
$(PERL) certdata.perl < certdata.txt
|
||||
|
||||
# This'll need some help from a build person.
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
# the terms of any one of the MPL, the GPL or the LGPL.
|
||||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
MAKEFILE_CVS_ID = "@(#) $RCSfile: Makefile,v $ $Revision: 1.4 $ $Date: 2007-05-08 01:31:23 $"
|
||||
MAKEFILE_CVS_ID = "@(#) $RCSfile: Makefile,v $ $Revision: 1.5 $ $Date: 2007-05-09 00:09:37 $"
|
||||
|
||||
include manifest.mn
|
||||
include $(CORE_DEPTH)/coreconf/config.mk
|
||||
|
|
@ -80,7 +80,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
|||
|
||||
# Generate certdata.c.
|
||||
generate:
|
||||
perl certdata.perl < certdata.txt
|
||||
$(PERL) certdata.perl < certdata.txt
|
||||
|
||||
# This'll need some help from a build person.
|
||||
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@
|
|||
## might work ... I haven't tested it.
|
||||
##
|
||||
#PERL=/usr/bin/perl
|
||||
PERL=perl
|
||||
#PERL=perl
|
||||
|
||||
include ../mpi/target.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@
|
|||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
#
|
||||
# $Id: Makefile,v 1.25 2007-05-08 01:31:22 neil.williams%sun.com Exp $
|
||||
# $Id: Makefile,v 1.26 2007-05-09 00:09:37 neil.williams%sun.com Exp $
|
||||
#
|
||||
|
||||
## Define CC to be the C compiler you wish to use. The GNU cc
|
||||
|
|
@ -55,7 +55,7 @@
|
|||
## might work ... I haven't tested it.
|
||||
##
|
||||
#PERL=/usr/bin/perl
|
||||
PERL=perl
|
||||
#PERL=perl
|
||||
|
||||
include target.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
#
|
||||
# $Id: Makefile.os2,v 1.5 2007-05-08 01:31:22 neil.williams%sun.com Exp $
|
||||
# $Id: Makefile.os2,v 1.6 2007-05-09 00:09:37 neil.williams%sun.com Exp $
|
||||
#
|
||||
|
||||
## Define CC to be the C compiler you wish to use. The GNU cc
|
||||
|
|
@ -55,7 +55,7 @@ AS=alp.exe
|
|||
## might work ... I haven't tested it.
|
||||
##
|
||||
#PERL=/usr/bin/perl
|
||||
PERL=perl
|
||||
#PERL=perl
|
||||
|
||||
##
|
||||
## Define CFLAGS to contain any local options your compiler
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
#
|
||||
# $Id: Makefile.win,v 1.5 2007-05-08 01:31:22 neil.williams%sun.com Exp $
|
||||
# $Id: Makefile.win,v 1.6 2007-05-09 00:09:37 neil.williams%sun.com Exp $
|
||||
#
|
||||
|
||||
## Define CC to be the C compiler you wish to use. The GNU cc
|
||||
|
|
@ -55,7 +55,7 @@ AS=ml.exe
|
|||
## might work ... I haven't tested it.
|
||||
##
|
||||
#PERL=/usr/bin/perl
|
||||
PERL=perl
|
||||
#PERL=perl
|
||||
|
||||
##
|
||||
## Define CFLAGS to contain any local options your compiler
|
||||
|
|
|
|||
|
|
@ -44,12 +44,13 @@
|
|||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
#
|
||||
# $Id: timetest,v 1.8 2007-05-08 01:31:22 neil.williams%sun.com Exp $
|
||||
# $Id: timetest,v 1.9 2007-05-09 00:09:37 neil.williams%sun.com Exp $
|
||||
#
|
||||
|
||||
# Avoid using built-in shell echoes
|
||||
ECHO=/bin/echo
|
||||
MAKE=gmake
|
||||
PERL=perl
|
||||
|
||||
# Use a fixed seed so timings will be more consistent
|
||||
# This one is the 11th-18th decimal digits of 'e'
|
||||
|
|
@ -122,7 +123,7 @@ for size in $sizes ; do
|
|||
$ECHO "- Gathering statistics for $size bits ... "
|
||||
./primegen $size $ntests | grep ticks | awk '{print $7}' | tr -d '(' > tt$$.tmp
|
||||
$ECHO "$size:" >> timing-results.txt
|
||||
perl stats tt$$.tmp >> timing-results.txt
|
||||
$PERL stats tt$$.tmp >> timing-results.txt
|
||||
tail -1 timing-results.txt
|
||||
rm -f tt$$.tmp
|
||||
done
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
# the terms of any one of the MPL, the GPL or the LGPL.
|
||||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
MAKEFILE_CVS_ID = "@(#) $RCSfile: Makefile,v $ $Revision: 1.9 $ $Date: 2007-05-08 01:31:22 $"
|
||||
MAKEFILE_CVS_ID = "@(#) $RCSfile: Makefile,v $ $Revision: 1.10 $ $Date: 2007-05-09 00:09:36 $"
|
||||
|
||||
include manifest.mn
|
||||
include $(CORE_DEPTH)/coreconf/config.mk
|
||||
|
|
@ -44,7 +44,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk
|
|||
# Generate oiddata.h and oiddata.c.
|
||||
oidgen: oidgen.perl oids.txt
|
||||
rm -f oiddata.c oiddata.h
|
||||
perl oidgen.perl oiddata.c oiddata.h oids.txt
|
||||
$(PERL) oidgen.perl oiddata.c oiddata.h oids.txt
|
||||
|
||||
export:: private_export
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче