Improve ace packaging. Fix Safari 4

jdhoffa · Feb 16, 2011 · d89e9ee · d89e9ee
1 parent b44a18f
commit d89e9ee
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "src/gwt/tools/ace"]
  path = src/gwt/tools/ace
- url = git://github.com/jcheng5/ace.git
+ url = git@github.com:jcheng5/ace.git
diff --git a/src/gwt/tools/ace b/src/gwt/tools/ace
diff --git a/src/gwt/tools/sync-ace-commits b/src/gwt/tools/sync-ace-commits
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+set -e
+
+cd ace
+git checkout master
+
+# Point this to the upstream commit that we've tested
+git reset --hard 3d1469e33
+
+git submodule update --init --recursive
+
+# Merge all the bugfix branches
+git merge forked-submodules bugfix-scrollbars bugfix-pagedown bugfix-webkit-paste bugfix-blankline
+
+
+cd support/pilot
+git merge bugfix-safari4
+cd ../..
+
+
+make clean
+make
+git commit -am "Update build"