RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 08-Jul-2017 18:59:54
Branch: rpm-5_4 Handle: 2017070816595400
Modified files: (Branch: rpm-5_4)
rpm/js extract.sh gen-config.sh
Log:
- rpmjss: ensure that js/include is identical to
/usr/include/mozjs-XY.
Summary:
Revision Changes Path
1.1.2.8 +77 -26 rpm/js/extract.sh
1.1.2.7 +8 -5 rpm/js/gen-config.sh
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/js/extract.sh
============================================================================
$ cvs diff -u -r1.1.2.7 -r1.1.2.8 extract.sh
--- rpm/js/extract.sh 8 Jul 2017 05:27:41 -0000 1.1.2.7
+++ rpm/js/extract.sh 8 Jul 2017 16:59:54 -0000 1.1.2.8
@@ -4,22 +4,36 @@
rm -rf extract
-mkdir extract
-mkdir extract/js
-mkdir -p extract/intl/icu/source/common/unicode
+mkdir -p extract/
+mkdir -p extract/js/
+mkdir -p extract/memory/build/
+mkdir -p extract/memory/fallible/
+mkdir -p extract/memory/mozjemalloc/
+mkdir -p extract/memory/mozalloc/
+mkdir -p extract/mozglue/misc/
+mkdir -p extract/intl/icu/source/common/unicode/
-cp -r mozilla-release/js/src mozilla-release/js/public extract/js/
-cp -r mozilla-release/mfbt extract/
+cp -p -r mozilla-release/js/src mozilla-release/js/public extract/js/
+cp -p -r mozilla-release/mfbt extract/
# We need these even without ICU
-cp mozilla-release/intl/icu/source/common/unicode/platform.h
extract/intl/icu/source/common/unicode
-cp mozilla-release/intl/icu/source/common/unicode/ptypes.h
extract/intl/icu/source/common/unicode
-cp mozilla-release/intl/icu/source/common/unicode/uconfig.h
extract/intl/icu/source/common/unicode
-cp mozilla-release/intl/icu/source/common/unicode/umachine.h
extract/intl/icu/source/common/unicode
-cp mozilla-release/intl/icu/source/common/unicode/urename.h
extract/intl/icu/source/common/unicode
-cp mozilla-release/intl/icu/source/common/unicode/utypes.h
extract/intl/icu/source/common/unicode
-cp mozilla-release/intl/icu/source/common/unicode/uvernum.h
extract/intl/icu/source/common/unicode
-cp mozilla-release/intl/icu/source/common/unicode/uversion.h
extract/intl/icu/source/common/unicode
+cp -p mozilla-release/intl/icu/source/common/unicode/platform.h
extract/intl/icu/source/common/unicode
+cp -p mozilla-release/intl/icu/source/common/unicode/ptypes.h
extract/intl/icu/source/common/unicode
+cp -p mozilla-release/intl/icu/source/common/unicode/uconfig.h
extract/intl/icu/source/common/unicode
+cp -p mozilla-release/intl/icu/source/common/unicode/umachine.h
extract/intl/icu/source/common/unicode
+cp -p mozilla-release/intl/icu/source/common/unicode/urename.h
extract/intl/icu/source/common/unicode
+cp -p mozilla-release/intl/icu/source/common/unicode/utypes.h
extract/intl/icu/source/common/unicode
+cp -p mozilla-release/intl/icu/source/common/unicode/uvernum.h
extract/intl/icu/source/common/unicode
+cp -p mozilla-release/intl/icu/source/common/unicode/uversion.h
extract/intl/icu/source/common/unicode
+
+cp -p -r mozilla-release/memory/build/moz*.h extract/memory/build
+cp -p -r mozilla-release/memory/fallible/fallible.h extract/memory/fallible
+cp -p -r mozilla-release/memory/mozjemalloc/jemalloc_types.h
extract/memory/mozjemalloc
+cp -p -r mozilla-release/memory/mozalloc/mozalloc_abort.h
extract/memory/mozalloc
+cp -p -r mozilla-release/memory/mozalloc/mozalloc.h extract/memory/mozalloc
+cp -p -r mozilla-release/memory/mozalloc/mozalloc_oom.h
extract/memory/mozalloc
+cp -p -r mozilla-release/mozglue/misc/StackWalk.h extract/mozglue/misc
+cp -p -r mozilla-release/mozglue/misc/TimeStamp.h extract/mozglue/misc
cd mozilla-release/js/src
@@ -73,12 +87,12 @@
cd ../../..
-cp mozilla-release/js/src/js/src/selfhosted.out.h extract/js/src
-cp mozilla-release/js/src/js/src/jsautokw.h extract/js/src
+cp -p mozilla-release/js/src/js/src/selfhosted.out.h extract/js/src
+cp -p mozilla-release/js/src/js/src/jsautokw.h extract/js/src
# mfbt doesn't change by arch or platform, so keep the same unified cpp
-mkdir extract/js/src/mfbt
-cp mozilla-release/js/src/mfbt/Unified_cpp_mfbt0.cpp extract/js/src/mfbt
+mkdir -p extract/js/src/mfbt/
+cp -p mozilla-release/js/src/mfbt/Unified_cpp_mfbt0.cpp extract/js/src/mfbt
sed 's/#include ".*\/mfbt\//#include "/' <
extract/js/src/mfbt/Unified_cpp_mfbt0.cpp > t1
sed 's/#error ".*\/mfbt\//#error "/' < t1 >
extract/js/src/mfbt/Unified_cpp_mfbt0.cpp
@@ -125,14 +139,13 @@
# stuff we don't want to deal with due to licensing
rm -rf \
- extract/mfbt/decimal \
extract/mfbt/tests \
extract/js/src/vm/make_unicode.py \
extract/js/src/vtune
# this is all of the EXPORTS files from the moz.build's
-mkdir -p include
-cp mozilla-release/js/src/js/src/js-config.h include
+mkdir -p include/
+cp -p mozilla-release/js/src/js/src/js-config.h include
FILES="
js.msg
@@ -151,11 +164,11 @@
perf/jsperf.h
"
for F in $FILES; do
- cp extract/js/src/$F include
+ cp -p extract/js/src/$F include
done
# this is all of the EXPORTS.js files from the moz.build's
-mkdir -p include/js
+mkdir -p include/js/
FILES="
CallArgs.h
CallNonGenericMethod.h
@@ -188,15 +201,39 @@
UbiNode.h
UbiNodeBreadthFirst.h
UbiNodeCensus.h
+ UbiNodeDominatorTree.h
+ UbiNodePostOrder.h
Utility.h
Value.h
Vector.h
WeakMapPtr.h
"
for F in $FILES; do
- [ -f extract/js/public/$F ] && cp extract/js/public/$F include/js
+ [ -f extract/js/public/$F ] && cp -p extract/js/public/$F include/js
done
+# Fedorable mozjs-XY distributes these files
+FILES="
+ memory/build/mozmemory.h
+ memory/build/mozmemory_wrap.h
+ memory/mozjemalloc/jemalloc_types.h
+"
+for F in $FILES; do
+ [ -f extract/$F ] && cp -p extract/$F include
+done
+
+mkdir -p include/mozilla
+FILES="
+ memory/fallible/fallible.h
+ memory/mozalloc/mozalloc_abort.h
+ memory/mozalloc/mozalloc.h
+ memory/mozalloc/mozalloc_oom.h
+ mozglue/misc/StackWalk.h
+ mozglue/misc/TimeStamp.h
+"
+for F in $FILES; do
+ [ -f extract/$F ] && cp -p extract/$F include/mozilla
+done
# this is all of the EXPORTS.mozilla files from the moz.build's
mkdir -p include/mozilla
@@ -218,16 +255,20 @@
Compiler.h
Compression.h
DebugOnly.h
+ Decimal.h
double-conversion/double-conversion.h
double-conversion/utils.h
Endian.h
EnumeratedArray.h
EnumeratedRange.h
EnumSet.h
+ fallible.h
FastBernoulliTrial.h
FloatingPoint.h
+ Function.h
GuardObjects.h
HashFunctions.h
+ IndexSequence.h
IntegerPrintfMacros.h
IntegerRange.h
IntegerTypeTraits.h
@@ -235,7 +276,6 @@
Likely.h
LinkedList.h
LinuxSignal.h
- WindowsVersion.h
MacroArgs.h
MacroForEach.h
MathAlgorithms.h
@@ -244,6 +284,9 @@
MemoryChecking.h
MemoryReporting.h
Move.h
+ mozalloc_abort.h
+ mozalloc.h
+ mozalloc_oom.h
NullPtr.h
NumericLimits.h
Opaque.h
@@ -251,7 +294,9 @@
PodOperations.h
Poison.h
Range.h
+ RangedArray.h
RangedPtr.h
+ RefCounted.h
RefCountType.h
ReentrancyGuard.h
RefPtr.h
@@ -264,22 +309,28 @@
SizePrintfMacros.h
Snprintf.h
SplayTree.h
+ StackWalk.h
TaggedAnonymousMemory.h
TemplateLib.h
ThreadLocal.h
+ TimeStamp.h
ToString.h
+ Tuple.h
TypedEnumBits.h
Types.h
TypeTraits.h
UniquePtr.h
+ UniquePtrExtensions.h
+ unused.h
Variant.h
Vector.h
WeakPtr.h
- unused.h
+ WindowsVersion.h
XorShift128PlusRNG.h
+ decimal/Decimal.h
"
for F in $FILES; do
- [ -f extract/mfbt/$F ] && cp extract/mfbt/$F include/mozilla
+ [ -f extract/mfbt/$F ] && cp -p extract/mfbt/$F include/mozilla
done
# Apply a local patch (best effort)
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/gen-config.sh
============================================================================
$ cvs diff -u -r1.1.2.6 -r1.1.2.7 gen-config.sh
--- rpm/js/gen-config.sh 8 Jul 2017 11:29:09 -0000 1.1.2.6
+++ rpm/js/gen-config.sh 8 Jul 2017 16:59:54 -0000 1.1.2.7
@@ -51,15 +51,18 @@
cd ../../..
-destdir="platform/$1/$2"
+#destdir="platform/$1/$2"
+#srcdir=build
+destdir=.
+srcdir=src
mkdir -p "$destdir/include"
cp -p mozilla-release/js/src/js/src/js-config.h "$destdir/include"
-subdir="$destdir/build"
+subdir="$destdir/$srcdir"
mkdir -p "$subdir/.deps/"
mkdir -p "$subdir/.old/"
-mv -f $subdir/Unified*.cpp "$subdir/.old/"
+mv -f $subdir/Unified*.cpp "$subdir/.old/" 2>/dev/null
cp -p mozilla-release/js/src/js/src/js-confdefs.h "$subdir"
cp -p mozilla-release/js/src/js/src/Unified_*.cpp "$subdir"
@@ -82,10 +85,10 @@
done
rm -rf "$subdir/.old/"
-subdir="$destdir/build/shell"
+subdir="$destdir/$srcdir/shell"
mkdir -p "$subdir/.deps/"
mkdir -p "$subdir/.old/"
-mv -f $subdir/Unified*.cpp "$subdir/.old/"
+mv -f $subdir/Unified*.cpp "$subdir/.old/" 2>/dev/null
cp -p mozilla-release/js/src/js/src/shell/Unified_* "$subdir"
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
