diff options
| author | Eduard Braun <eduard.braun2@gmx.de> | 2016-03-05 15:03:39 +0000 |
|---|---|---|
| committer | Eduard Braun <eduard.braun2@gmx.de> | 2016-03-05 15:03:39 +0000 |
| commit | c8bcd8d3d0934f17a699b6eb3d205e5dc66a66ad (patch) | |
| tree | ab9b9eeadefe1fa7d59b0ef84da9a408879c688c | |
| parent | btool: Switch regex library from T-Rex to SLRE (diff) | |
| download | inkscape-c8bcd8d3d0934f17a699b6eb3d205e5dc66a66ad.tar.gz inkscape-c8bcd8d3d0934f17a699b6eb3d205e5dc66a66ad.zip | |
btool: Update buildfiles for previous commit
(bzr r14690)
| -rw-r--r-- | build-x64-gtk3.xml | 18 | ||||
| -rw-r--r-- | build-x64.xml | 26 | ||||
| -rw-r--r-- | build.xml | 8 |
3 files changed, 35 insertions, 17 deletions
diff --git a/build-x64-gtk3.xml b/build-x64-gtk3.xml index 73e9ab898..d9f95151a 100644 --- a/build-x64-gtk3.xml +++ b/build-x64-gtk3.xml @@ -793,9 +793,11 @@ <copy todir="${dist}"> <fileset dir="share"> - <exclude name=".*\.am"/> - <exclude name=".*\.in"/> - <exclude name=".*\.sh"/> + <exclude name="\.am$"/> + <exclude name="\.in$"/> + <exclude name="\.sh$"/> + <exclude name="CMakeLists.txt"/> + <exclude name="i18n.py"/> <exclude name="icons/hicolor/index.theme"/> </fileset> </copy> @@ -805,8 +807,8 @@ <copy todir="${dist}/share/glib-2.0"> <fileset dir="${devlibs}/share/glib-2.0/schemas"/> </copy> <copy todir="${dist}/lib"> <fileset dir="${devlibs}/lib/gdk-pixbuf-2.0"> - <exclude name=".*\.la"/> - <exclude name=".*\.dll\.a"/> + <exclude name="\.la$"/> + <exclude name="\.a$"/> </fileset> </copy> @@ -814,7 +816,11 @@ <copy todir="${dist}/share"> <fileset dir="${devlibs}/share/poppler"/> </copy> <!-- Locales for libraries (few should be needed) --> - <copy todir="${dist}/share"> <fileset dir="${devlibs}/share/locale"/> </copy> + <copy todir="${dist}/share"> + <fileset dir="${devlibs}/share/locale"> + <include name="gtk30.mo"/> + </fileset> + </copy> <!-- Aspell dictionaries --> <copy todir="${dist}/lib"> <fileset dir="${devlibs}/lib/aspell-0.60"/> </copy> diff --git a/build-x64.xml b/build-x64.xml index c3fe58a2b..a4600d387 100644 --- a/build-x64.xml +++ b/build-x64.xml @@ -766,21 +766,29 @@ <exclude name="gtk-3.0/.*"/> </fileset> </copy> - <copy todir="${dist}/lib"> <fileset dir="${devlibs}/lib/gtk-2.0"/> </copy> + <copy todir="${dist}/lib"> + <fileset dir="${devlibs}/lib/gtk-2.0"> + <exclude name="\.la$"/> + <exclude name="\.a$"/> + <exclude name="include/"/> + </fileset> + </copy> <!-- <copy todir="${dist}/lib"> <fileset dir="${devlibs}/lib/glib-2.0"/> </copy> --> <copy todir="${dist}"> <fileset dir="share"> - <exclude name=".*\.am"/> - <exclude name=".*\.in"/> - <exclude name=".*\.sh"/> + <exclude name="\.am$"/> + <exclude name="\.in$"/> + <exclude name="\.sh$"/> + <exclude name="CMakeLists.txt"/> + <exclude name="i18n.py"/> </fileset> </copy> <delete dir="${dist}/share/icons/hicolor"/> <!-- Quick fix for the following problem: having the hicolor folder there with empty index file bugs booting inkscape... --> <copy todir="${dist}/share"> <fileset dir="${devlibs}/share/themes"/> </copy> <copy todir="${dist}/lib"> <fileset dir="${devlibs}/lib/gdk-pixbuf-2.0"> - <exclude name=".*\.la"/> - <exclude name=".*\.dll\.a"/> + <exclude name="\.la$"/> + <exclude name="\.a$"/> </fileset> </copy> @@ -788,7 +796,11 @@ <copy todir="${dist}/share"> <fileset dir="${devlibs}/share/poppler"/> </copy> <!-- Locales for libraries (few should be needed) --> - <copy todir="${dist}/share"> <fileset dir="${devlibs}/share/locale"/> </copy> + <copy todir="${dist}/share"> + <fileset dir="${devlibs}/share/locale"> + <include name="gtk20.mo"/> + </fileset> + </copy> <!-- Aspell dictionaries --> <copy todir="${dist}/lib"> <fileset dir="${devlibs}/lib/aspell-0.60"/> </copy> @@ -720,7 +720,7 @@ <!-- MSGFMT files --> <copy todir="${dist}"> <fileset dir="${build}/locale"> - <exclude name=".*\.am"/> + <exclude name="\.am$"/> </fileset> </copy> @@ -735,9 +735,9 @@ <copy todir="${dist}/lib"> <fileset dir="${devlibs}/lib/glib-2.0"/> </copy> <copy todir="${dist}"> <fileset dir="share"> - <exclude name=".*\.am"/> - <exclude name=".*\.in"/> - <exclude name=".*\.sh"/> + <exclude name="\.am$"/> + <exclude name="\.in$"/> + <exclude name="\.sh$"/> </fileset> </copy> <copy todir="${dist}/share"> <fileset dir="${devlibs}/share/locale"/> </copy> |