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 13:29:09
Branch: rpm-5_4 Handle: 2017070811290900
Modified files: (Branch: rpm-5_4)
rpm/js Makefile.am gen-config.sh
Log:
- rpmjs45: regenerate platform build tree preserving timestamps.
Summary:
Revision Changes Path
1.44.2.15 +6 -4 rpm/js/Makefile.am
1.1.2.6 +49 -10 rpm/js/gen-config.sh
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/js/Makefile.am
============================================================================
$ cvs diff -u -r1.44.2.14 -r1.44.2.15 Makefile.am
--- rpm/js/Makefile.am 8 Jul 2017 08:14:42 -0000 1.44.2.14
+++ rpm/js/Makefile.am 8 Jul 2017 11:29:09 -0000 1.44.2.15
@@ -148,7 +148,6 @@
# ${moz_builddir}/Unified_cpp_js_src36.cpp
rpmjs45_SOURCES = \
- rpmjs45shim.cpp \
${moz_builddir}/Unified_cpp_js_src0.cpp \
${moz_builddir}/Unified_cpp_js_src1.cpp \
${moz_builddir}/Unified_cpp_js_src2.cpp \
@@ -186,7 +185,8 @@
${moz_builddir}/Unified_cpp_js_src34.cpp \
${moz_builddir}/Unified_cpp_js_src35.cpp \
${moz_builddir}/Unified_cpp_js_src36.cpp \
- rpmjs45.cpp
+ rpmjs45shim.cpp \
+ ${moz_builddir}/shell/Unified_cpp_js_src_shell0.cpp
rpmjs45_CPPFLAGS = \
-DEXPORT_JS_API \
-DJS_HAS_CTYPES \
@@ -194,13 +194,15 @@
-fPIC \
-DMOZILLA_CLIENT \
-D'moz_xmalloc(_len)=malloc(_len)' \
- -I./include \
- -I${moz_builddir} \
-I${moz_srcdir}/js/src/shell \
-I${moz_srcdir}/js/src \
-I${moz_srcdir}/dist/include \
-I${moz_srcdir}/shell \
-I${moz_srcdir} \
+ -I${moz_builddir} \
+ -I${srcdir}/include \
+ -I${srcdir} \
+ -I${builddir} \
-I../rpmio \
-include ${top_srcdir}/config.h \
-include js-confdefs.h \
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/gen-config.sh
============================================================================
$ cvs diff -u -r1.1.2.5 -r1.1.2.6 gen-config.sh
--- rpm/js/gen-config.sh 8 Jul 2017 05:27:41 -0000 1.1.2.5
+++ rpm/js/gen-config.sh 8 Jul 2017 11:29:09 -0000 1.1.2.6
@@ -51,19 +51,58 @@
cd ../../..
-rm -rf platform/$1/$2/
+destdir="platform/$1/$2"
-mkdir -p platform/$1/$2/build
-mkdir platform/$1/$2/include
+mkdir -p "$destdir/include"
+cp -p mozilla-release/js/src/js/src/js-config.h "$destdir/include"
-cp mozilla-release/js/src/js/src/js-confdefs.h platform/$1/$2/build
-cp mozilla-release/js/src/js/src/*.cpp platform/$1/$2/build
-cp mozilla-release/js/src/js/src/js-config.h platform/$1/$2/include
-
-for unified_file in $(ls -1 platform/$1/$2/build/*.cpp) ; do
- sed 's/#include ".*\/js\/src\//#include "/' < $unified_file > t1
- sed 's/#error ".*\/js\/src\//#error "/' < t1 > $unified_file
+subdir="$destdir/build"
+mkdir -p "$subdir/.deps/"
+mkdir -p "$subdir/.old/"
+mv -f $subdir/Unified*.cpp "$subdir/.old/"
+
+cp -p mozilla-release/js/src/js/src/js-confdefs.h "$subdir"
+cp -p mozilla-release/js/src/js/src/Unified_*.cpp "$subdir"
+
+for subfile in $subdir/*.cpp ; do
+ sed 's/#include ".*\/js\/src\//#include "/' < "$subfile" > t1
+ sed 's/#error ".*\/js\/src\//#error "/' < t1 > "$subfile"
rm t1
+ file=$(basename "$subfile")
+ depfile=$(basename "$file" .cpp).Po
+ reffile="$subdir/.old/$file"
+ if [ -f "$reffile" ]; then
+ touch -r "$reffile" "$subfile"
+ touch -r "$reffile" "$subdir/.deps/rpmjs45-$depfile"
+ touch -r "$reffile" "$subdir/.deps/$depfile"
+ else
+ touch "$subdir/.deps/rpmjs45-$depfile"
+ touch "$subdir/.deps/$depfile"
+ fi
done
+rm -rf "$subdir/.old/"
+
+subdir="$destdir/build/shell"
+mkdir -p "$subdir/.deps/"
+mkdir -p "$subdir/.old/"
+mv -f $subdir/Unified*.cpp "$subdir/.old/"
+cp -p mozilla-release/js/src/js/src/shell/Unified_* "$subdir"
+for subfile in $subdir/*.cpp ; do
+ sed 's/#include ".*\/js\/src\//#include "/' < "$subfile" > t1
+ sed 's/#error ".*\/js\/src\//#error "/' < t1 > "$subfile"
+ rm t1
+ file=$(basename "$subfile")
+ depfile=$(basename "$file" .cpp).Po
+ reffile="$subdir/.old/$file"
+ if [ -f "$reffile" ]; then
+ touch -r "$reffile" "$subfile"
+ touch -r "$reffile" "$subdir/.deps/rpmjs45-$depfile"
+ touch -r "$reffile" "$subdir/.deps/$depfile"
+ else
+ touch "$subdir/.deps/rpmjs45-$depfile"
+ touch "$subdir/.deps/$depfile"
+ fi
+done
+rm -rf "$subdir/.old/"
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
