Remove gtkrc too, and cleanup EXTRA_DIST ($(desktop_in_files) is unused) Signed-off-by: Marc-André Lureau <marcandre.lureau@xxxxxxxxx> --- configure.ac | 1 - data/Makefile.am | 9 +-- data/gtkrc | 1 - data/spicy.nsis.in | 228 ----------------------------------------------------- 4 files changed, 3 insertions(+), 236 deletions(-) delete mode 100644 data/gtkrc delete mode 100644 data/spicy.nsis.in diff --git a/configure.ac b/configure.ac index e19330e..ea19762 100644 --- a/configure.ac +++ b/configure.ac @@ -736,7 +736,6 @@ spice-client-gtk-2.0.pc spice-client-gtk-3.0.pc spice-controller.pc data/Makefile -data/spicy.nsis po/Makefile.in src/Makefile src/spice-version.h diff --git a/data/Makefile.am b/data/Makefile.am index a289c23..06592de 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,11 +1,8 @@ NULL= -EXTRA_DIST = \ - spicy.nsis \ - spice-protocol.vapi \ - gtkrc \ - $(desktop_in_files) \ - org.spice-space.lowlevelusbaccess.policy \ +EXTRA_DIST = \ + spice-protocol.vapi \ + org.spice-space.lowlevelusbaccess.policy \ $(NULL) vapidir = $(VAPIDIR) diff --git a/data/gtkrc b/data/gtkrc deleted file mode 100644 index 4a0ddd0..0000000 --- a/data/gtkrc +++ /dev/null @@ -1 +0,0 @@ -gtk-theme-name = "MS-Windows" diff --git a/data/spicy.nsis.in b/data/spicy.nsis.in deleted file mode 100644 index b7c6335..0000000 --- a/data/spicy.nsis.in +++ /dev/null @@ -1,228 +0,0 @@ -#!Nsis Installer Command Script -# -# This is an NSIS Installer Command Script generated automatically -# by the Fedora nsiswrapper program. For more information see: -# -# http://fedoraproject.org/wiki/MinGW -# -# To build an installer from the script you would normally do: -# -# makensis spicy.nsis -# -# which will generate the output file 'spicy-@VERSION@.exe' which is a Windows -# installer containing your program. - -Name "spicy" -OutFile "spicy-@VERSION@.exe" -InstallDir "c:\spicy" -InstallDirRegKey HKLM SOFTWARE\spicy "Install_Dir" - -ShowInstDetails hide -ShowUninstDetails hide - -# Uncomment this to enable BZip2 compression, which results in -# slightly smaller files but uses more memory at install time. -SetCompressor bzip2 - -XPStyle on - -Page components -Page directory -Page instfiles - -ComponentText "Select which optional components you want to install." - -DirText "Please select the installation folder." - -Section "spicy" - SectionIn RO - - SetOutPath "$INSTDIR\bin" - File "/usr/i686-w64-mingw32/sys-root/mingw/bin/libatk-1.0-0.dll" - File "/usr/i686-w64-mingw32/sys-root/mingw/bin/libcairo-2.dll" - File "/usr/i686-w64-mingw32/sys-root/mingw/bin/libcelt051-0.dll" - File "/usr/i686-w64-mingw32/sys-root/mingw/bin/libcrypto-10.dll" - File "/usr/i686-w64-mingw32/sys-root/mingw/bin/libexpat-1.dll" - File "/usr/i686-w64-mingw32/sys-root/mingw/bin/libffi-6.dll" - File "/usr/i686-w64-mingw32/sys-root/mingw/bin/libfontconfig-1.dll" - File "/usr/i686-w64-mingw32/sys-root/mingw/bin/libfreetype-6.dll" - File "/usr/i686-w64-mingw32/sys-root/mingw/bin/libgdk-win32-2.0-0.dll" - File "/usr/i686-w64-mingw32/sys-root/mingw/bin/libgdk-win32-2.0-0.dll" - File "/usr/i686-w64-mingw32/sys-root/mingw/bin/libgdk_pixbuf-2.0-0.dll" - File "/usr/i686-w64-mingw32/sys-root/mingw/bin/libgdk_pixbuf-2.0-0.dll" - File "/usr/i686-w64-mingw32/sys-root/mingw/bin/libgio-2.0-0.dll" - File "/usr/i686-w64-mingw32/sys-root/mingw/bin/libglib-2.0-0.dll" - File "/usr/i686-w64-mingw32/sys-root/mingw/bin/libgmodule-2.0-0.dll" - File "/usr/i686-w64-mingw32/sys-root/mingw/bin/libgobject-2.0-0.dll" - File "/usr/i686-w64-mingw32/sys-root/mingw/bin/libgthread-2.0-0.dll" - File "/usr/i686-w64-mingw32/sys-root/mingw/bin/libgtk-win32-2.0-0.dll" - File "/usr/i686-w64-mingw32/sys-root/mingw/bin/iconv.dll" - File "/usr/i686-w64-mingw32/sys-root/mingw/bin/libintl-8.dll" - File "/usr/i686-w64-mingw32/sys-root/mingw/bin/libjpeg-62.dll" - File "/usr/i686-w64-mingw32/sys-root/mingw/bin/liborc-0.4-0.dll" - File "/usr/i686-w64-mingw32/sys-root/mingw/bin/liborc-test-0.4-0.dll" - File "/usr/i686-w64-mingw32/sys-root/mingw/bin/libpango-1.0-0.dll" - File "/usr/i686-w64-mingw32/sys-root/mingw/bin/libpangocairo-1.0-0.dll" - File "/usr/i686-w64-mingw32/sys-root/mingw/bin/libpangoft2-1.0-0.dll" - File "/usr/i686-w64-mingw32/sys-root/mingw/bin/libpangowin32-1.0-0.dll" - File "/usr/i686-w64-mingw32/sys-root/mingw/bin/libpixman-1-0.dll" - File "/usr/i686-w64-mingw32/sys-root/mingw/bin/libpng15-15.dll" - File "/usr/i686-w64-mingw32/sys-root/mingw/bin/libspice-client-glib-2.0-1.dll" - File "/usr/i686-w64-mingw32/sys-root/mingw/bin/libspice-client-gtk-2.0-1.dll" - File "/usr/i686-w64-mingw32/sys-root/mingw/bin/libssl-10.dll" - File "/usr/i686-w64-mingw32/sys-root/mingw/bin/libxml2-2.dll" - File "/usr/i686-w64-mingw32/sys-root/mingw/bin/pango-querymodules.exe" - File "/usr/i686-w64-mingw32/sys-root/mingw/bin/snappy.exe" - File "/usr/i686-w64-mingw32/sys-root/mingw/bin/spicy.exe" - File "/usr/i686-w64-mingw32/sys-root/mingw/bin/zlib1.dll" - # gstreamer1 - File "/usr/i686-w64-mingw32/sys-root/mingw/bin/gst-inspect-1.0.exe" - File "/usr/i686-w64-mingw32/sys-root/mingw/bin/gst-launch-1.0.exe" - File "/usr/i686-w64-mingw32/sys-root/mingw/bin/gst-typefind-1.0.exe" - File "/usr/i686-w64-mingw32/sys-root/mingw/bin/libgstbase-1.0-0.dll" - File "/usr/i686-w64-mingw32/sys-root/mingw/bin/libgstcontroller-1.0-0.dll" - File "/usr/i686-w64-mingw32/sys-root/mingw/bin/libgstreamer-1.0-0.dll" - # gstreamer1-plugins-base - File "/usr/i686-w64-mingw32/sys-root/mingw/bin/libgstapp-1.0-0.dll" - File "/usr/i686-w64-mingw32/sys-root/mingw/bin/libgstaudio-1.0-0.dll" - File "/usr/i686-w64-mingw32/sys-root/mingw/bin/libgstfft-1.0-0.dll" - File "/usr/i686-w64-mingw32/sys-root/mingw/bin/libgstpbutils-1.0-0.dll" - File "/usr/i686-w64-mingw32/sys-root/mingw/bin/libgsttag-1.0-0.dll" - - SetOutPath "$INSTDIR\etc" - File /r "/usr/i686-w64-mingw32/sys-root/mingw/etc/fonts" - File /r "/usr/i686-w64-mingw32/sys-root/mingw/etc/gtk-2.0" - CreateDirectory "$INSTDIR\etc\pango" - - SetOutPath "$INSTDIR\etc\gtk-2.0" - File /r "gtkrc" - - SetOutPath "$INSTDIR\lib" - File /r "/usr/i686-w64-mingw32/sys-root/mingw/lib/gdk-pixbuf-2.0" - File /r "/usr/i686-w64-mingw32/sys-root/mingw/lib/gtk-2.0" - File /r "/usr/i686-w64-mingw32/sys-root/mingw/lib/pango" - - SetOutPath "$INSTDIR\lib\gstreamer-1.0" - # gstreamer1 - File "/usr/i686-w64-mingw32/sys-root/mingw/lib/gstreamer-1.0/libgstcoreelements.dll" - # gstreamer1-plugins-base - File "/usr/i686-w64-mingw32/sys-root/mingw/lib/gstreamer-1.0/libgstapp.dll" - File "/usr/i686-w64-mingw32/sys-root/mingw/lib/gstreamer-1.0/libgstaudioconvert.dll" - File "/usr/i686-w64-mingw32/sys-root/mingw/lib/gstreamer-1.0/libgstaudiorate.dll" - File "/usr/i686-w64-mingw32/sys-root/mingw/lib/gstreamer-1.0/libgstaudioresample.dll" - # gstreamer1-plugins-good - File "/usr/i686-w64-mingw32/sys-root/mingw/lib/gstreamer-1.0/libgstautodetect.dll" - File "/usr/i686-w64-mingw32/sys-root/mingw/lib/gstreamer-1.0/libgstdirectsoundsink.dll" - # gstreamer1-plugins-bad - File "/usr/i686-w64-mingw32/sys-root/mingw/lib/gstreamer-1.0/libgstdirectsoundsrc.dll" - - SetOutPath "$INSTDIR\share\themes\MS-Windows\gtk-2.0" - File "/usr/i686-w64-mingw32/sys-root/mingw/share/themes/MS-Windows/gtk-2.0/gtkrc" - - ReadEnvStr $0 COMSPEC - SetOutPath "$INSTDIR" - nsExec::ExecToLog '$0 /C bin\pango-querymodules.exe > etc\pango\pango.modules' -SectionEnd - -Section "Start Menu Shortcuts" - CreateDirectory "$SMPROGRAMS\spicy" - CreateShortCut "$SMPROGRAMS\spicy\Uninstall spicy.lnk" "$INSTDIR\Uninstall spicy.exe" "" "$INSTDIR\Uninstall spicy.exe" 0 - CreateShortCut "$SMPROGRAMS\spicy\spicy.exe.lnk" "$INSTDIR\bin\spicy.exe" "" "$INSTDIR\bin\spicy.exe" 0 -SectionEnd - -Section "Desktop Icons" - CreateShortCut "$DESKTOP\spicy.exe.lnk" "$INSTDIR\bin\spicy.exe" "" "$INSTDIR\bin\spicy.exe" 0 -SectionEnd - -Section "Uninstall" - Delete /rebootok "$DESKTOP\spicy.exe.lnk" - Delete /rebootok "$SMPROGRAMS\spicy\spicy.exe.lnk" - Delete /rebootok "$SMPROGRAMS\spicy\Uninstall spicy.lnk" - RMDir "$SMPROGRAMS\spicy" - - RMDir /r "$INSTDIR\lib\pango" - - RMDir /r "$INSTDIR\lib\gtk-2.0" - - # gstreamer1 - Delete /rebootok "$INSTDIR\lib\gstreamer-1.0\libgstcoreelements.dll" - # gstreamer1-plugins-base - Delete /rebootok "$INSTDIR\lib\gstreamer-1.0\libgstapp.dll" - Delete /rebootok "$INSTDIR\lib\gstreamer-1.0\libgstaudioconvert.dll" - Delete /rebootok "$INSTDIR\lib\gstreamer-1.0\libgstaudiorate.dll" - Delete /rebootok "$INSTDIR\lib\gstreamer-1.0\libgstaudioresample.dll" - # gstreamer1-plugins-good - Delete /rebootok "$INSTDIR\lib\gstreamer-1.0\libgstautodetect.dll" - Delete /rebootok "$INSTDIR\lib\gstreamer-1.0\libgstdirectsoundsink.dll" - # gstreamer1-plugins-bad - Delete /rebootok "$INSTDIR\lib\gstreamer-1.0\libgstdirectsoundsrc.dll" - RMDir "$INSTDIR\lib\gstreamer-1.0" - - RMDir /r "$INSTDIR\lib\gdk-pixbuf-2.0" - - RMDir /r "$INSTDIR\etc\pango" - - RMDir /r "$INSTDIR\etc\gtk-2.0" - - RMDir /r "$INSTDIR\etc\fonts" - - Delete /rebootok "$INSTDIR\bin\spicy.exe" - Delete /rebootok "$INSTDIR\bin\snappy.exe" - Delete /rebootok "$INSTDIR\bin\pango-querymodules.exe" - Delete /rebootok "$INSTDIR\bin\libpangoft2-1.0-0.dll" - Delete /rebootok "$INSTDIR\bin\libgdk_pixbuf-2.0-0.dll" - Delete /rebootok "$INSTDIR\bin\libgdk-win32-2.0-0.dll" - # gstreamer1 - Delete /rebootok "$INSTDIR\bin\gst-inspect-1.0.exe" - Delete /rebootok "$INSTDIR\bin\gst-launch-1.0.exe" - Delete /rebootok "$INSTDIR\bin\gst-typefind-1.0.exe" - Delete /rebootok "$INSTDIR\bin\libgstbase-1.0-0.dll" - Delete /rebootok "$INSTDIR\bin\libgstcontroller-1.0-0.dll" - Delete /rebootok "$INSTDIR\bin\libgstreamer-1.0-0.dll" - # gstreamer1-plugins-base - Delete /rebootok "$INSTDIR\bin\libgstapp-1.0-0.dll" - Delete /rebootok "$INSTDIR\bin\libgstaudio-1.0-0.dll" - Delete /rebootok "$INSTDIR\bin\libgstfft-1.0-0.dll" - Delete /rebootok "$INSTDIR\bin\libgstpbutils-1.0-0.dll" - Delete /rebootok "$INSTDIR\bin\libgsttag-1.0-0.dll" - - RMDir "$INSTDIR\bin" - - Delete /rebootok "$INSTDIR\bin\libffi-6.dll" - Delete /rebootok "$INSTDIR\bin\zlib1.dll" - Delete /rebootok "$INSTDIR\bin\libxml2-2.dll" - Delete /rebootok "$INSTDIR\bin\libssl-10.dll" - Delete /rebootok "$INSTDIR\bin\libspice-client-gtk-2.0-1.dll" - Delete /rebootok "$INSTDIR\bin\libspice-client-glib-2.0-1.dll" - Delete /rebootok "$INSTDIR\bin\libpng15-15.dll" - Delete /rebootok "$INSTDIR\bin\libpixman-1-0.dll" - Delete /rebootok "$INSTDIR\bin\libpangowin32-1.0-0.dll" - Delete /rebootok "$INSTDIR\bin\libpangocairo-1.0-0.dll" - Delete /rebootok "$INSTDIR\bin\libpango-1.0-0.dll" - Delete /rebootok "$INSTDIR\bin\liborc-test-0.4-0.dll" - Delete /rebootok "$INSTDIR\bin\liborc-0.4-0.dll" - Delete /rebootok "$INSTDIR\bin\libjpeg-62.dll" - Delete /rebootok "$INSTDIR\bin\libintl-8.dll" - Delete /rebootok "$INSTDIR\bin\iconv.dll" - Delete /rebootok "$INSTDIR\bin\libgtk-win32-2.0-0.dll" - Delete /rebootok "$INSTDIR\bin\libgthread-2.0-0.dll" - Delete /rebootok "$INSTDIR\bin\libgobject-2.0-0.dll" - Delete /rebootok "$INSTDIR\bin\libgmodule-2.0-0.dll" - Delete /rebootok "$INSTDIR\bin\libglib-2.0-0.dll" - Delete /rebootok "$INSTDIR\bin\libgio-2.0-0.dll" - Delete /rebootok "$INSTDIR\bin\libgdk_pixbuf-2.0-0.dll" - Delete /rebootok "$INSTDIR\bin\libgdk-win32-2.0-0.dll" - Delete /rebootok "$INSTDIR\bin\libfreetype-6.dll" - Delete /rebootok "$INSTDIR\bin\libfontconfig-1.dll" - Delete /rebootok "$INSTDIR\bin\libexpat-1.dll" - Delete /rebootok "$INSTDIR\bin\libcrypto-10.dll" - Delete /rebootok "$INSTDIR\bin\libcelt051-0.dll" - Delete /rebootok "$INSTDIR\bin\libcairo-2.dll" - Delete /rebootok "$INSTDIR\bin\libatk-1.0-0.dll" - RMDir "$INSTDIR\bin" - RMDir "$INSTDIR" -SectionEnd - -Section -post - WriteUninstaller "$INSTDIR\Uninstall spicy.exe" -SectionEnd -- 2.5.0 _______________________________________________ Spice-devel mailing list Spice-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/spice-devel