[adwaita-icon-theme] Visual Studio builds: Fix .pc generation



commit b323228f79aca1fbbef332da4d3c5b0c33f22500
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Mon Mar 13 17:34:36 2017 +0800

    Visual Studio builds: Fix .pc generation
    
    I missed out the rules to generate and copy the .pc files, and we don't
    actually install gnome-icon-theme-symbolic.pc.

 win32/adwaita-msvc.mak.in |   10 +++++++++-
 win32/adwaitapc.py        |    7 +------
 2 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/win32/adwaita-msvc.mak.in b/win32/adwaita-msvc.mak.in
index 2228f0a..22b04fb 100644
--- a/win32/adwaita-msvc.mak.in
+++ b/win32/adwaita-msvc.mak.in
@@ -29,6 +29,7 @@ NULL=
 ICON_SUBDIR=share\icons\Adwaita
 GDK_PIXBUF_MOD_VERSION=2.10.0
 ADWAITA_VERSION=@VERSION@
+ADWAITA_PC_FILES=adwaita-icon-theme.pc
 
 # Generate the NMake Makefile modules for the listing of subdirs for each icon size
 !if [@for /f %s in ('dir /b /on $(SRCROOTDIR)\Adwaita') do @if not "%s" == "cursors" (@echo SIZE_%s_dirs = 
\> %s.mak) & (@for /f %d in ('dir /b $(SRCROOTDIR)\Adwaita\%s') do @echo %s/%d \>> %s.mak) & @echo ^$(NULL) 
%s.mak]
@@ -138,10 +139,14 @@ dir_list.py:
 
 .SUFFIXES: .svg .png
 
+$(ADWAITA_PC_FILES): ..\adwaita-icon-theme.pc.in
+       @echo Generating $@...
+       $(PYTHON) adwaitapc.py --prefix=$(PREFIX) --version=$(ADWAITA_VERSION)
+
 # Copy the icon and cursor files, and convert the SVG symbolic icons if:
 # -The gtk-encode-symbolic-svg tool is found in $(PREFIX)\bin -AND-
 # -The SVG GDK-Pixbuf loader can be found in $(PREFIX)\lib\gdk-pixbuf-2.0\2.10.0\loaders
-install: index.theme
+install: index.theme $(ADWAITA_PC_FILES)
        @-mkdir $(PREFIX)\$(ICON_SUBDIR)
        copy index.theme $(PREFIX)\$(ICON_SUBDIR)
        for /f %d in ('dir /b $(SRCROOTDIR)\Adwaita') do                                                      
          \
@@ -162,6 +167,8 @@ install: index.theme
                                @(for /f %f in ('dir /b /on $(SRCROOTDIR)\Adwaita\scalable\%d') do            
          \
                                        @($(PREFIX)\bin\gtk-encode-symbolic-svg 
$(SRCROOTDIR)\Adwaita\scalable\%d\%f    \
                                         %z -o $(PREFIX)\$(ICON_SUBDIR)\%z\%d))))
+       if not exist $(PREFIX)\share\pkgconfig mkdir $(PREFIX)\share\pkgconfig
+       copy adwaita-icon-theme.pc $(PREFIX)\share\pkgconfig
        @if exist $(PREFIX)\bin\gtk-update-icon-cache.exe                                                     
          \
        @(echo Update icon cache...) &                                                                        
          \
        @($(PREFIX)\bin\gtk-update-icon-cache -q $(PREFIX)\$(ICON_SUBDIR))
@@ -171,5 +178,6 @@ clean:
        @-del index.theme
        @-del index.theme.tmp
        @-del dir_list.py
+       @-del adwaita-icon-theme.pc
        @-for %a in (*.pyc) do @del *.pyc
        @-if exist __pycache__ rmdir /s /q __pycache__
diff --git a/win32/adwaitapc.py b/win32/adwaitapc.py
index 21de437..09bd057 100644
--- a/win32/adwaitapc.py
+++ b/win32/adwaitapc.py
@@ -18,15 +18,10 @@ def main(argv):
 
     base_pc.setup(argv)
 
-    # Generate libsoup-2.4.pc
+    # Generate adwaita-icon-theme.pc
     replace_multi(base_pc.top_srcdir + '/adwaita-icon-theme.pc.in',
                   base_pc.srcdir + '/adwaita-icon-theme.pc',
                   base_pc.base_replace_items)
 
-    # Generate libsoup-gnome-2.4.pc
-    replace_multi(base_pc.top_srcdir + '/gnome-icon-theme-symbolic.pc.in',
-                  base_pc.srcdir + '/gnome-icon-theme-symbolic.pc',
-                  base_pc.base_replace_items)
-
 if __name__ == '__main__':
     sys.exit(main(sys.argv))


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]