[SCM] jigsaw packaging branch, master, updated. d8e67fa731b64c7da8351ea0c69fb9eee5019949
Guillaume Mazoyer
respawneral at gmail.com
Fri Sep 30 18:52:40 UTC 2011
The following commit has been merged in the master branch:
commit d8e67fa731b64c7da8351ea0c69fb9eee5019949
Author: Guillaume Mazoyer <respawneral at gmail.com>
Date: Fri Sep 30 20:51:41 2011 +0200
Fix for jpkg tool. Debian patch not needed anymore.
diff --git a/.hg/tags.cache b/.hg/tags.cache
new file mode 100644
index 0000000..763b1fd
--- /dev/null
+++ b/.hg/tags.cache
@@ -0,0 +1,133 @@
+382 db00b7627ab109c4661eeeece24f99dbd5717f39 463be2b9347974a9a699d88a3bd536f52dc930fc
+
+f42e3d9394b40a423d345b8da22687b5462e5f25 jdk8-b01
+59b497130f82ec809c245ffb5e521e3a5fabf8af jdk7-b58
+030142474602b4a067662fffc0c8e541de5a78df jdk7-b59
+ba12117a5e6c918578d6b2a8c693232a33289024 jdk7-b56
+ffd09e767dfa6d21466183a400f72cf62d53297f jdk7-b57
+2ef382b1bbd58a68e668391c6145a4b2066c5b96 jdk7-b54
+aea0ace7a1e43619800931d42bbf69c579361c2d jdk7-b55
+4264c2fe66493e57c411045a1b61377796641e45 jdk7-b52
+c235f4a8559d196879c56af80159f67ee5d0e720 jdk7-b53
+5111e13e44e542fe945b47ab154546daec36737d jdk7-b50
+0f0189d55ce4a1f7840da7582ac7d970b3b7ab15 jdk7-b51
+541bdc5ad32fc33255944d0a044ad992f3d915e8 jdk7-b41
+44be42de6693063fb191989bf0e188de2fa51e7c jdk7-b40
+848e684279d2ba42577d9621d5b2e5af3823d12d jdk7-b43
+94052b87287303527125026fe4b2698cf867ea83 jdk7-b42
+99846f001ca214015578d593802d26e27246a802 jdk7-b45
+a395e3aac4744cc9033fcd819fad1239a45add52 jdk7-b44
+d7744e86dedc21a8ecf6bdb73eb191b8eaf5b0da jdk7-b47
+e8a2a4d187773a62f3309b0fa265c13425bc2258 jdk7-b46
+aee93a8992d2389121eb610c00a86196f3e2b9b0 jdk7-b49
+4ae9f4bfdb98f65bd957e3fe72471b320150b38e jdk7-b48
+ea7bd43ecda59edb09026663bb704bfd912d460a jigsaw-b06
+696214fdbb709e4b7a27628b71fbb559d7ec6810 jigsaw-b04
+bb6913e3202a17d245da7e9bd42552d961655fd8 jigsaw-b05
+87cdb467827802f7e9953bcd775ea4499025b55d jigsaw-b02
+bef3965ce4a87a9646518e46f00664849bd8704f jigsaw-b03
+5f0790f5534291795aa311bf8f5e72e4f0ec47b5 jigsaw-b01
+a6b015b59fbc2518762c17ccc35702f03ef7713a jdk7-b129
+57d702105b23fb90e40beaf00f8f8aeae5e249e7 jdk7-b128
+2c2d4f88637b488014c37e1a2eb401f68bca8838 jdk7-b121
+366ff0b6d2151595629806b033e2e1497e3a55d4 jdk7-b120
+ed6950da30cf1e8904b4bdb034d471647942271f jdk7-b123
+f1591eed71f64f6eba79fb7426f5616cc4dfea73 jdk7-b122
+5c4df7e992775c102f08e9f1c0a124b324641b70 jdk7-b125
+024a6755895bf91b5a3c98984c89ee018efbf538 jdk7-b124
+bd70f76b0309068f157ae759c36eac8f2c6d098e jdk7-b127
+b566d490905691787f8931f69947a92c67c6d5e4 jdk7-b126
+46a989ab932992b2084b946eeb322fa99b9fee6c jdk7-b34
+143c1abedb7d3095eff0f9ee5fec9bf48e3490fc jdk7-b35
+4b4f5fea8d7d0743f0c30d91fcd9bf9d96e5d2ad jdk7-b36
+744554f5a3290e11c71cd2ddb1aff49e431f9ed0 jdk7-b37
+2dab2f712e1832c92acfa63ec0337048b9422c20 jdk7-b30
+3300a35a0bd56d695b92fe0b34f03ebbfc939064 jdk7-b31
+64da805be725721bf2004e7409a0d7a16fc8ddbc jdk7-b32
+bb1ef4ee3d2c8cbf43a37d372325a7952be590b9 jdk7-b33
+cc47a76899ed33a2c513cb688348244c9b5a1288 jdk7-b38
+ab523b49de1fc73fefe6855ce1e0349bdbd7af29 jdk7-b39
+fc47c97bbbd91b1f774d855c48a7e285eb1a351a jdk7-b138
+7ed6d0b9aaa12320832a7ddadb88d6d8d0dda4c1 jdk7-b139
+0f62a65fb666b337caa585015ab6ea2e60e709ca jdk7-b132
+c6f380693342feadccc5fe2c5adf500e861361aa jdk7-b133
+cc58c11af15411042719e9c82707fdbef60a9e0f jdk7-b130
+5d86d951426aaf340b1ba84ae2d5ab5da65a71e2 jdk7-b131
+2fe76e73adaa5133ac559f0b3c2c0707eca04580 jdk7-b136
+7654afc6a29e43cb0a1343ce7f1287bf690d5e5f jdk7-b137
+ddc2fcb3682ffd27f44354db666128827be7e3c3 jdk7-b134
+783bd02b4ab4596059c74b10a1793d7bd2f1c157 jdk7-b135
+11b4dc9f2be3523ef989a0db8459eb56b3045c3a jdk7-b27
+9410f77cc30c604d1caf7c9fe3a57fa19e1acbe8 jdk7-b26
+cbc8ad9dd0e085a607427ea35411990982f19a36 jdk7-b25
+cfeea66a3fa8ca3686a7cfa2d0ce8ab0169f168d jdk7-b24
+31e08f70e88d77c2053f91c21b49a04296bdc59a jdk7-b29
+56652b46f328937f6b9b5130f1e4cd80f48868ef jdk7-b28
+81dfc728d7bb7e1fff4a4dc6d0f7cea5a3315667 jdk7-b109
+140fdef4ddf52244013b6157dc542cd9f677bb6f jdk7-b108
+7d396ad455c3b2f68b0d7094891c5aba7c757a6e jdk7-b107
+43096cccf1cee749c2f4e7714ee71f4e9e0f4d7f jdk7-b106
+9f96a4269d7727dad68864eaab795eafce270311 jdk7-b105
+f8be576feefce0c6695f188ef97ec16b73ad9cfd jdk7-b104
+be2aedc4e3b1751c1310f334242ba69e90867f38 jdk7-b103
+a136a51f5113da4dad3853b74a8536ab583ab112 jdk7-b102
+4193eaf5f1b82794c6a0fb1a8d11af43d1b1d611 jdk7-b101
+b218a53ec7d3d42be61d31d6917a6c5c037b6f56 jdk7-b100
+2a02d4a6955c7c078aee9a604cb3be409800d82c jdk7-b110
+9702d6fef68e17533ee7fcf5923b11ead3e912ce jdk7-b111
+b852103caf73da70068473777ae867a457bb3ae1 jdk7-b112
+c1df968c4527bfab5f97662a89245f15d12d378b jdk7-b113
+27985a5c6e5268014d25d55886e0ecb96af4763d jdk7-b114
+e8ebdf41b9c01a26642848f4134f5504e8fb3233 jdk7-b115
+94e9a1bfba8b8d1fe0bfd43b88629b1f27b02a76 jdk7-b116
+7220e60b097fa027e922f1aeecdd330f3e37409f jdk7-b117
+a12a9e78df8a9d534da0b4a244ed68f0de0bd58e jdk7-b118
+661360bef6ccad6c119f067f5829b207de80c936 jdk7-b119
+5f5c33d417f3a14706b09a4a95e65fa7b6fa54d6 jdk7-b92
+5fc102ff48f0e787ce9cc77249841d5ff0941b75 jdk7-b93
+425ba3efabbfe0b188105c10aaf7c3c8fa8d1a38 jdk7-b90
+97d8b6c659c29c8493a8b2b72c2796a021a8cf79 jdk7-b91
+cf71cb5151166f35433afebaf67dbf34a704a170 jdk7-b96
+5e197c942c6ebd8b92f324a31049c5f1d26d40ef jdk7-b97
+d7f35c61afa092b6357c2c4bce3f298f16620f71 jdk7-b94
+fd3663286e77b9f13c39eee124db2beb079b3ca6 jdk7-b95
+6cea9984d73d74de0cd01f30d07ac0a1ed196117 jdk7-b98
+e7f18db469a3e947b7096bfd12e87380e5a042cd jdk7-b99
+ab4ae8f4514693a9fe17ca2fec0239d8f8450d2c jdk7-b78
+20aeeb51713990dbea6929a2e100a8bbf5df70d4 jdk7-b79
+175cb3fe615998d1004c6d3fd96e6d2e86b6772d jdk7-b70
+4c36e9853dda27bdac5ef4839a610509fbe31d34 jdk7-b71
+0d7e03b426df27c21dcc44ffb9178eacd1b04f10 jdk7-b72
+3ac6dcf7823205546fbbc3d4ea59f37358d0b0d4 jdk7-b73
+2c88089b6e1c053597418099a14232182c387edc jdk7-b74
+d1516b9f23954b29b8e76e6f4efc467c08c78133 jdk7-b75
+c8b63075403d53a208104a8a6ea5072c1cb66aab jdk7-b76
+1f17ca8353babb13f4908c1f87d11508232518c8 jdk7-b77
+cf26288a114be67c39f2758959ce50b60f5ae330 jdk7-b85
+2f3ea057d1ad56cf3b269cdc4de2741411151982 jdk7-b84
+6b1069f53fbc30663ccef49d78c31bb7d6967bde jdk7-b87
+433a60a9c0bf1b26ee7e65cebaa89c541f497aed jdk7-b86
+8403096d1fe7ff5318df9708cfec84a3fd3e1cf9 jdk7-b81
+a3242906c7747b5d9bcc3d118c7c3c69aa40f4b7 jdk7-b80
+6880a3af9addb41541e80ebe8cde6f79ec402a58 jdk7-b83
+e1176f86805fe07fd9fb9da065dc51b47712ce76 jdk7-b82
+7f1ba4459972bf84b8201dc1cc4f62b1fe1c74f4 jdk7-b89
+82135c848d5fcddb065e98ae77b81077c858f593 jdk7-b88
+82e6c820c51ac27882b77755d42efefdbf1dcda0 jdk7-b69
+e1b972ff53cd58f825791f8ed9b2deffd16e768c jdk7-b68
+57f7e028c7ad1806500ae89eb3f4cd9a51b10e18 jdk7-b63
+c7ed15ab92ce36a09d264a5e34025884b2d7607f jdk7-b62
+472c21584cfd7e9c0229ad6a100366a5c03d2976 jdk7-b61
+39565502682c7085369bd09e51640919dc741097 jdk7-b60
+c4523c6f82048f420bf0d57c4cd47976753b7d2c jdk7-b67
+6bad5e3fe50337d95b1416d744780d65bc570da6 jdk7-b66
+e01380cd1de4ce048b87d059d238e5ab5e341947 jdk7-b65
+269c1ec4435dfb7b452ae6e3bdde005d55c5c830 jdk7-b64
+14b8e7eee1058fd4ed5a2700a2ce14b3616278f1 jdk7-b143
+cfbbdb77eac0397b03eb99ee2e07ea00e0a7b81e jdk7-b142
+c6569c5585851dfd39b8de8e021c3c312f51af12 jdk7-b141
+dcfe74f1c6553c556e7d361c30b0b614eb5e40f6 jdk7-b140
+d91364304d7c4ecd34caffdba2b840aeb0d10b51 jdk7-b147
+2d38c2a79c144c30cd04d143d83ee7ec6af40771 jdk7-b146
+55e9ebf032186c333e5964ed044419830ac02693 jdk7-b145
+7203965666a4fe63bf82f5e4204f41ce6285e716 jdk7-b144
diff --git a/debian-wip/patches/01_jpkg_fix.patch b/debian-wip/patches/01_jpkg_fix.patch
deleted file mode 100644
index 81577fc..0000000
--- a/debian-wip/patches/01_jpkg_fix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-## Description: add some description
-## Origin/Author: add some origin or author
-## Bug: bug URL
-Index: jigsaw-1.8/jdk/src/share/classes/org/openjdk/jigsaw/cli/Packager.java
-===================================================================
---- jigsaw-1.8.orig/jdk/src/share/classes/org/openjdk/jigsaw/cli/Packager.java 2011-08-12 15:48:45.362843743 +0200
-+++ jigsaw-1.8/jdk/src/share/classes/org/openjdk/jigsaw/cli/Packager.java 2011-08-12 15:48:45.550844675 +0200
-@@ -261,7 +261,7 @@
- }
-
- private String translateVersion(String v) {
-- return v.replaceAll("-", "_");
-+ return v.replaceAll("-", ".");
- }
-
- private String computeDependencies(ModuleInfo info)
diff --git a/debian-wip/patches/series b/debian-wip/patches/series
index 37d258a..30eade9 100644
--- a/debian-wip/patches/series
+++ b/debian-wip/patches/series
@@ -1,4 +1,3 @@
-01_jpkg_fix.patch
02_jtreg_binary.patch
03_hosts_tests.patch
04_junit_jar.patch
diff --git a/jdk/.hg/cache/branchheads b/jdk/.hg/cache/branchheads
index b8b7ab5..69c9a0e 100644
--- a/jdk/.hg/cache/branchheads
+++ b/jdk/.hg/cache/branchheads
@@ -1,2 +1,2 @@
-9fe9b92a77070ae03f603377c8447bcc36ce3267 4492
-9fe9b92a77070ae03f603377c8447bcc36ce3267 default
+90808f8d462f713f13b1907bf8669683ca6b7be7 4707
+90808f8d462f713f13b1907bf8669683ca6b7be7 default
diff --git a/jdk/.hg/dirstate b/jdk/.hg/dirstate
index 2fe9e49..e7ab5d6 100644
Binary files a/jdk/.hg/dirstate and b/jdk/.hg/dirstate differ
diff --git a/jdk/.hg/store/00changelog.d b/jdk/.hg/store/00changelog.d
index 8109ca2..0d3ae3a 100644
Binary files a/jdk/.hg/store/00changelog.d and b/jdk/.hg/store/00changelog.d differ
diff --git a/jdk/.hg/store/00changelog.i b/jdk/.hg/store/00changelog.i
index 161a024..c62c38e 100644
Binary files a/jdk/.hg/store/00changelog.i and b/jdk/.hg/store/00changelog.i differ
diff --git a/jdk/.hg/store/00manifest.d b/jdk/.hg/store/00manifest.d
index 0b2cbbf..edb48ea 100644
Binary files a/jdk/.hg/store/00manifest.d and b/jdk/.hg/store/00manifest.d differ
diff --git a/jdk/.hg/store/00manifest.i b/jdk/.hg/store/00manifest.i
index 83c8f4d..3475874 100644
Binary files a/jdk/.hg/store/00manifest.i and b/jdk/.hg/store/00manifest.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/cli/_packager.java.i b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/cli/_packager.java.i
index ca2a5e2..26bc821 100644
Binary files a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/cli/_packager.java.i and b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/cli/_packager.java.i differ
diff --git a/jdk/.hg/store/undo b/jdk/.hg/store/undo
index ca1cd96..413c5a9 100644
Binary files a/jdk/.hg/store/undo and b/jdk/.hg/store/undo differ
diff --git a/debian-wip/jigsaw-deprecated.tools.install b/jdk/.hg/undo.bookmarks
similarity index 100%
copy from debian-wip/jigsaw-deprecated.tools.install
copy to jdk/.hg/undo.bookmarks
diff --git a/jdk/.hg/undo.desc b/jdk/.hg/undo.desc
index aa0595c..f8fc0fa 100644
--- a/jdk/.hg/undo.desc
+++ b/jdk/.hg/undo.desc
@@ -1,3 +1,3 @@
-4702
+4707
pull
http://hg.openjdk.java.net/jigsaw/jigsaw/jdk
diff --git a/jdk/.hg/undo.dirstate b/jdk/.hg/undo.dirstate
index 76ee247..2fe9e49 100644
Binary files a/jdk/.hg/undo.dirstate and b/jdk/.hg/undo.dirstate differ
diff --git a/jdk/src/share/classes/org/openjdk/jigsaw/cli/Packager.java b/jdk/src/share/classes/org/openjdk/jigsaw/cli/Packager.java
index 4deca2a..f91d49a 100644
--- a/jdk/src/share/classes/org/openjdk/jigsaw/cli/Packager.java
+++ b/jdk/src/share/classes/org/openjdk/jigsaw/cli/Packager.java
@@ -261,23 +261,33 @@ public class Packager {
}
private String translateVersion(String v) {
- return v.replaceAll("-", "_");
+ // Debian version format: [epoch:]upstream_version[-debian_revision]
+ // upstream_version may contain only alphanumerics and '.', '+', '-', '~'
+ // There is no epoch, ':' not allowed.
+ //
+ if (!v.matches("[A-Za-z0-9\\+-~\\.]+"))
+ throw new AssertionError("Invalid debian version format: " + v);
+ return v;
}
private String computeDependencies(ModuleInfo info)
{
StringBuilder deps = new StringBuilder();
- for (Dependence d : info.requires())
+ for (Dependence d : info.requires()) {
+ if (d.modifiers().contains(Dependence.Modifier.OPTIONAL))
+ continue; // skip optional dependency
+
deps.append(", ")
.append(d.query().name())
.append(' ')
.append(d.query().versionQuery() != null ?
"(" + translateVersion(d.query().versionQuery().toString()) + ")" :
"");
+ }
return deps.length() > 0 ?
- deps.substring(1) :
+ deps.substring(2) :
"";
}
@@ -290,7 +300,7 @@ public class Packager {
.append(id.name());
return deps.length() > 0 ?
- deps.substring(1) :
+ deps.substring(2) :
"";
}
--
jigsaw packaging
More information about the pkg-java-commits
mailing list