[geany/geany] 2523a2: Merge branch 'scintilla-update-script'

Colomban Wendling git-noreply at xxxxx
Tue Apr 21 14:19:11 UTC 2015

Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Tue, 21 Apr 2015 14:19:11 UTC
Commit:      2523a25f9ca2db34f369f1b0bdb7107895bae762

Log Message:
Merge branch 'scintilla-update-script'

Small improvements to the Scintilla update script

Modified Paths:

Modified: HACKING
16 lines changed, 16 insertions(+), 0 deletions(-)
@@ -677,6 +677,22 @@ When you have these two files, you have to list your new test along the
 other ones in the ``test_source`` variable in ``tests/ctags/Makefile.am``.
 Please keep this list sorted alphabetically.
+Upgrading Scintilla
+To upgrade the local Scintilla copy, use the ``scripts/update-scintilla.sh``
+To use it, you need to first obtain a copy of the Scintilla sources you want
+to update to.  This will generally mean checking out a release tag from the
+Scintilla Mercurial repository, or extracting a tarball.
+Then, just run the script from Geany's to source directory passing the path
+to the Scintilla source directory as first argument, and follow the
+instructions, if any::
+    ./scripts/update-scintilla.sh /path/to/scintilla/

Modified: scripts/update-scintilla.sh
26 lines changed, 15 insertions(+), 11 deletions(-)
@@ -56,11 +56,13 @@ done
 git apply -p0 scintilla/scintilla_changes.patch || {
 	echo "scintilla_changes.patch doesn't apply, please update it and retry."
 	echo "Changes for the catalogue are:"
-	git diff -p -R scintilla/src/Catalogue.cxx | tee
-	echo "Make sure to strip the leading a/ and b/!"
+	git diff -p -R --src-prefix= --dst-prefix= scintilla/src/Catalogue.cxx | cat
 	exit 1
+# show a nice success banner
+echo "Scintilla update successful!" | sed 'h;s/./=/g;p;x;p;x'
 #check whether there are new files
 if git status -unormal -s scintilla | grep '^??'; then
 	cat <<EOF
@@ -72,18 +74,20 @@ Don't forget to add new files to the build system.
-# summary
-cat << EOF
-Scintilla update successful!
-Please check the diff and upgrade the style mappings in
+# check for possible changes to styles
+if ! git diff --quiet scintilla/include/SciLexer.h; then
+	cat << EOF
 Check the diff of scintilla/include/SciLexer.h to see whether and which
-mapping to add or update (use git diff scintilla/include/SciLexer.h).
+mapping to add or update in src/highlightingmappings.h
+(use git diff scintilla/include/SciLexer.h).
 Don't forget to also update the comment and string styles in
+# summary
+cat << EOF
-Finally, add or update the appropriate line in NEWS.
+Don't forget to add or update the appropriate line in NEWS.

This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

More information about the Commits mailing list