From e11b2ff5535ce50a89fa113ac2934935fa806eea Mon Sep 17 00:00:00 2001 From: koops76 Date: Sun, 24 Sep 2017 01:52:51 +0300 Subject: [PATCH 1/5] Update merge-rulesets.sh --- utils/merge-rulesets.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/utils/merge-rulesets.sh b/utils/merge-rulesets.sh index 180306a2ee8c..50abb8fcc8ef 100644 --- a/utils/merge-rulesets.sh +++ b/utils/merge-rulesets.sh @@ -7,3 +7,5 @@ python2.7 ./utils/merge-rulesets.py RULESETS=chrome/content/rules/default.rulesets + +touch -r src/install.rdf $RULESETS From 536f598c477ecd4503a6a3ebf8b8686aa9bd60d7 Mon Sep 17 00:00:00 2001 From: koops76 Date: Sun, 24 Sep 2017 01:53:47 +0300 Subject: [PATCH 2/5] Update merge-rulesets.py --- utils/merge-rulesets.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/utils/merge-rulesets.py b/utils/merge-rulesets.py index 960353cf3af8..4175e812896d 100644 --- a/utils/merge-rulesets.py +++ b/utils/merge-rulesets.py @@ -89,9 +89,5 @@ def normalize(f): outfile.write(json.dumps(library)) outfile.close() -# We make default.rulesets at build time, -# but it shouldn't have a variable timestamp -subprocess.call(["touch", "-r", "src/install.rdf", ofn]) - # Everything is okay. -print(" * Everything is Okay.") +print(" * Everything is okay.") From ab48ef5f8f29e2bf2d4eedfeafa44c6600d80ad8 Mon Sep 17 00:00:00 2001 From: koops76 Date: Sun, 24 Sep 2017 01:55:01 +0300 Subject: [PATCH 3/5] Update merge-rulesets.sh --- utils/merge-rulesets.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/merge-rulesets.sh b/utils/merge-rulesets.sh index 50abb8fcc8ef..c908d5293a45 100644 --- a/utils/merge-rulesets.sh +++ b/utils/merge-rulesets.sh @@ -1,11 +1,11 @@ #!/bin/sh -# Merge all the .xml rulesets into a single "default.rulesets" file -- this -# prevents inodes from wasting disk space, but more importantly, works around -# the fact that zip does not perform well on a pile of small files. +# Merge all the .xml rulesets into a single "default.rulesets" file -- this prevents inodes from wasting disk space, but more importantly, +# works around the fact that zip does not perform well on a pile of small files. python2.7 ./utils/merge-rulesets.py RULESETS=chrome/content/rules/default.rulesets +# We make default.rulesets at build time, but it shouldn't have a variable timestamp. touch -r src/install.rdf $RULESETS From 4621151151407a3f2eda78d9f9587a772f1d0757 Mon Sep 17 00:00:00 2001 From: koops76 Date: Sun, 24 Sep 2017 02:41:10 +0300 Subject: [PATCH 4/5] Update merge-rulesets.sh --- utils/merge-rulesets.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/merge-rulesets.sh b/utils/merge-rulesets.sh index c908d5293a45..75ad876107e9 100644 --- a/utils/merge-rulesets.sh +++ b/utils/merge-rulesets.sh @@ -8,4 +8,4 @@ python2.7 ./utils/merge-rulesets.py RULESETS=chrome/content/rules/default.rulesets # We make default.rulesets at build time, but it shouldn't have a variable timestamp. -touch -r src/install.rdf $RULESETS +touch -r src/install.rdf src/$RULESETS From 5b5323b4cb33c02a1489da057f32582542d746d8 Mon Sep 17 00:00:00 2001 From: koops76 Date: Sat, 21 Oct 2017 13:44:44 +0300 Subject: [PATCH 5/5] Update merge-rulesets.sh --- utils/merge-rulesets.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/utils/merge-rulesets.sh b/utils/merge-rulesets.sh index 75ad876107e9..5d29565d88f4 100644 --- a/utils/merge-rulesets.sh +++ b/utils/merge-rulesets.sh @@ -1,7 +1,8 @@ #!/bin/sh -# Merge all the .xml rulesets into a single "default.rulesets" file -- this prevents inodes from wasting disk space, but more importantly, -# works around the fact that zip does not perform well on a pile of small files. +# Merge all the .xml rulesets into a single "default.rulesets" file -- this +# prevents inodes from wasting disk space, but more importantly, works around +# the fact that zip does not perform well on a pile of small files. python2.7 ./utils/merge-rulesets.py