Updating test_with_tycho.patch

ecatmur · Oct 30, 2013 · 26eacb5 · 26eacb5
1 parent a50de6f
commit 26eacb5
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -87,19 +87,23 @@
           SIGN_STOREPASS=<store password entered above>
           SIGN_KEYPASS=<key password entered above>
        3) Run the build
+       
      - Update all poms/manifests/feature with a new version number
        When -SNAPSHOT is used, in the manifests it is replaced with
        .qualifier
        1) Apply the test_with_tycho.patch
             git apply test_with_tycho.patch
+            
        2) Run the new version command
             mvn -o tycho-versions:set-version -Dtycho.localArtifacts=ignore -DnewVersion=3.0.0-SNAPSHOT
                (-o can be used if all the dependencies are already in .m2 directory,
                 if not you need to run without the -o on the first run)
+                
        3) Reverse the test_with_tycho.patch
             git apply -R test_with_tycho.patch
                (if this fails it means you need to manually recreate the patch
                 because it is no longer valid)
+                
      - Sync pom and feature.xml version numbers to manifest ones.
           "mvn -o tycho-versions:update-pom -Dtycho.localArtifacts=ignore"
           (See the notes about setting versions above, e.g. you need to do this

diff --git a/test_with_tycho.patch b/test_with_tycho.patch
@@ -6,6 +6,21 @@ place the minimum possible in this patch file. For now the information
 required is to put all tests*/ source directories in the build plug-in
 and add any test only third-party jars into the MANIFEST.MF
 
+- Updating the test_with_tycho.patch
+  When there are changes where the patch no longer applies cleanly with:
+  	 git apply test_with_tycho.patch
+
+  The best approach is first trying to apply it using:
+    git apply test_with_tycho.patch -3
+
+    if it applies, create a new diff: git diff --cached > new_diff.patch and update the needed sections
+    on the test_with_tycho.patch (as it may have manual tweaks to be less strict).
+
+    and then revert the changes: git apply test_with_tycho.patch -R
+
+  If that fails, it's possible to manually change the file where the patch no longer applies to have the changes
+  that the diff would do, then diff if it and manually fix the patch file.
+
 IF RE-CREATING PATCH, KEEP/UPDATE THIS COMMENT!
 
 diff --git a/plugins/com.python.pydev.analysis/build.properties b/plugins/com.python.pydev.analysis/build.properties
@@ -194,18 +209,17 @@ index 3b35556..96595dd 100644
 +               contrib/ch/hsr/ukistler/astgraph/jgraph-5.8.3.1.jar
  jars.compile.order = refactoring.jar
 diff --git a/plugins/org.python.pydev.shared_core/build.properties b/plugins/org.python.pydev.shared_core/build.properties
-index dd25be4..c797faf 100644
+index b9871ea..61c1e4e 100644
 --- a/plugins/org.python.pydev.shared_core/build.properties
 +++ b/plugins/org.python.pydev.shared_core/build.properties
-@@ -3,6 +3,7 @@ bin.includes = shared_core.jar,\
-                LICENSE.txt,\
-                libs/
+@@ -2,5 +2,6 @@ bin.includes = shared_core.jar,\
+                META-INF/,\
+                LICENSE.txt
  jars.compile.order = shared_core.jar
 -source.shared_core.jar = src/
 +source.shared_core.jar = src/,\
 +                         tests/
  output.shared_core.jar = bin/
- jars.extra.classpath = libs/jpathwatch-0-95.jar
 diff --git a/plugins/org.python.pydev/build.properties b/plugins/org.python.pydev/build.properties
 index 60abbb6..ccf6dad 100644
 --- a/plugins/org.python.pydev/build.properties