Skip to content

Commit

Permalink
Revert "Use configure.ac to insert the compilation of resources"
Browse files Browse the repository at this point in the history
This reverts commit ae52d32.
  • Loading branch information
fossfreedom authored and jnsh committed Feb 23, 2019
1 parent ca5fe97 commit 75309d0
Show file tree
Hide file tree
Showing 4 changed files with 62 additions and 23 deletions.
17 changes: 16 additions & 1 deletion common/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,22 @@ endif # ENABLE_DARK

endif #!ENABLE_TRANSPARENCY

#GTK32xCOMPILE
cd $(srcdir)/gtk-3.0/$(GNOME_VERSION) && cp -RL \
compile-gresources.sh \
$(ithemedir)/gtk-3.0/compile-gresources.sh

cd $(srcdir)/gtk-3.0/$(GNOME_VERSION) && cp -RL \
compile-gresources.sh \
$(ithemedarkdir)/gtk-3.0/compile-gresources.sh

cd $(srcdir)/gtk-3.0/$(GNOME_VERSION) && cp -RL \
compile-gresources.sh \
$(ithemedarkerdir)/gtk-3.0/compile-gresources.sh

cd $(ithemedir)/gtk-3.0/ && ./compile-gresources.sh
cd $(ithemedarkdir)/gtk-3.0/ && ./compile-gresources.sh
cd $(ithemedarkerdir)/gtk-3.0/ && ./compile-gresources.sh


endif # ENABLE_GTK3

Expand Down
46 changes: 46 additions & 0 deletions common/compile-gresources.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
#!/bin/bash

# Setup
mv gtk.css gtk-main.css
mv gtk-dark.css gtk-main-dark.css


# Get processed assets lists
ls ./assets | sort > temp_asset_list.txt


# Build dynamic gresouce xml spec from css and assets
read -d '' RES_PART1 <<"EOF"
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
<gresource prefix="/org/gnome/arc-theme">
EOF
echo $RES_PART1 > gtk.gresource.xml


# Import as nodes the file assets
xargs -i echo '<file preprocess="to-pixdata">assets/{}</file>' >> gtk.gresource.xml < temp_asset_list.txt
rm -f temp_asset_list.txt


# Write the css file information to the template
read -d '' RES_PART2 <<"EOF"
<file>gtk-main.css</file>
<file>gtk-main-dark.css</file>
</gresource>
</gresources>
EOF
echo $RES_PART2 >> gtk.gresource.xml

# Compile the gresource file
glib-compile-resources gtk.gresource.xml
echo '@import url("resource:///org/gnome/arc-theme/gtk-main.css");' > gtk.css
echo '@import url("resource:///org/gnome/arc-theme/gtk-main-dark.css");' > gtk-dark.css


# Cleanup
rm -rf assets
rm -f gtk.gresource.xml
rm -f gtk-main.css
rm -f gtk-main-dark.css
rm -f compile-gresources.sh
15 changes: 0 additions & 15 deletions common/gtk-3.0/3.20/compile-script.txt

This file was deleted.

7 changes: 0 additions & 7 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,3 @@ AC_CONFIG_FILES([
])

AC_OUTPUT

# For 3.2 and later add compile resources script
AS_IF(
[test `expr $GNOME_VERSMNR` != "18"],
[sed -i '/#GTK32xCOMPILE/r ./common/gtk-3.0/3.20/compile-script.txt' ./common/Makefile]
[AC_MSG_RESULT([Adding resource compilation])]
)

0 comments on commit 75309d0

Please sign in to comment.