diff options
| author | Friedrich W. H. Kossebau <friedrich@kogmbh.com> | 2013-11-26 03:23:20 +0400 |
|---|---|---|
| committer | Friedrich W. H. Kossebau <friedrich@kogmbh.com> | 2013-11-26 03:23:20 +0400 |
| commit | 4bf872b95ce1030911bfd6cf4597607418934aef (patch) | |
| tree | e64ca3f1b41098e271aeba0cc599dbb248867451 /src | |
| parent | 2bab561b4190b1ee70f22408d4ffdab409956633 (diff) | |
Small fixes to updateWebODF.sh
Diffstat (limited to 'src')
| -rwxr-xr-x | src/updateWebODF.sh | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/updateWebODF.sh b/src/updateWebODF.sh index 05165042..212ecea1 100755 --- a/src/updateWebODF.sh +++ b/src/updateWebODF.sh @@ -22,19 +22,20 @@ cp "$WEBODF_BUILDDIR"/programs/editor/dojo-amalgamation.js ./js/3rdparty/webodf # Tools, Editor, EditorSession, MemberListView: cp "$WEBODF_BUILDDIR"/programs/editor/{Tools,Editor,EditorSession,MemberListView}.js ./js/3rdparty/webodf/editor -cp "$WEBODF_BUILDDIR"/programs/editor/server/owncloud/* ./js/3rdparty/webodf/editor/server/owncloud -R cp "$WEBODF_BUILDDIR"/programs/editor/server/pullbox/* ./js/3rdparty/webodf/editor/server/pullbox -R cp "$WEBODF_BUILDDIR"/programs/editor/server/ServerFactory.js ./js/3rdparty/webodf/editor/server -R cp "$WEBODF_BUILDDIR"/programs/editor/widgets ./js/3rdparty/webodf/editor -R cp "$WEBODF_BUILDDIR"/programs/editor/nls ./js/3rdparty/webodf/editor -R cp "$WEBODF_BUILDDIR"/programs/editor/editor.css ./css/3rdparty/webodf -# dojo stuff -# TODO - # patches against upstream patch -p1 -i src/patches/fontsCssPath.patch patch -p1 -i src/patches/hideCaretAvatar.patch patch -p1 -i src/patches/MemberListView-OCavatar.patch patch -p1 -i src/patches/keepBodyStyle.patch -patch -p1 -i src/patches/dojoStylesPill.patch + + +# files which need to be adapted manually: +# "$WEBODF_BUILDDIR"/programs/editor/dojo-deps/src/app/resources/app.css -> ./css/3rdparty/webodf/dojo-app.css +# dojo-app.css has other paths then upstream, needs to be manually adapted to changes +# also is dojo.css is not imported here, other than in upstream |