From f5dcbf41927bdf64fe01cfa4fb613ab5a13d64e5 Mon Sep 17 00:00:00 2001 From: pabs Date: Mon, 7 Jan 2008 01:59:36 +0000 Subject: [PATCH] Fix building the Win32 installer: update Win32 install scripts to remove versions from the module dll filenames because r1261 added -avoid-version which changed all the filenames of the modules git-svn-id: http://svn.voria.com/code@1274 1f10aa63-cdf2-0310-b900-c93c546f37ac --- synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.nsh | 2 +- synfig-core/trunk/src/modules/lyr_std/lyr_std.nsh | 2 +- synfig-core/trunk/src/modules/mod_bmp/mod_bmp.nsh | 2 +- synfig-core/trunk/src/modules/mod_dv/mod_dv.nsh | 2 +- synfig-core/trunk/src/modules/mod_ffmpeg/mod_ffmpeg.nsh | 2 +- synfig-core/trunk/src/modules/mod_filter/mod_filter.nsh | 2 +- synfig-core/trunk/src/modules/mod_geometry/mod_geometry.nsh | 2 +- synfig-core/trunk/src/modules/mod_gif/mod_gif.nsh | 2 +- synfig-core/trunk/src/modules/mod_gradient/mod_gradient.nsh | 2 +- synfig-core/trunk/src/modules/mod_imagemagick/mod_imagemagick.nsh | 2 +- synfig-core/trunk/src/modules/mod_jpeg/mod_jpeg.nsh | 2 +- synfig-core/trunk/src/modules/mod_libavcodec/mod_libavcodec.nsh | 2 +- synfig-core/trunk/src/modules/mod_magickpp/mod_magickpp.nsh | 2 +- synfig-core/trunk/src/modules/mod_mng/mod_mng.nsh | 2 +- synfig-core/trunk/src/modules/mod_noise/mod_noise.nsh | 2 +- synfig-core/trunk/src/modules/mod_openexr/mod_openexr.nsh | 2 +- synfig-core/trunk/src/modules/mod_particle/mod_particle.nsh | 2 +- synfig-core/trunk/src/modules/mod_png/mod_png.nsh | 2 +- synfig-core/trunk/src/modules/mod_ppm/mod_ppm.nsh | 2 +- synfig-core/trunk/src/modules/mod_yuv420p/mod_yuv420p.nsh | 2 +- synfig-core/trunk/src/modules/template.nsh | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.nsh b/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.nsh index 5977f97..8188231 100644 --- a/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.nsh +++ b/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.nsh @@ -7,7 +7,7 @@ Section "lyr_freetype" Sec_lyr_freetype SetOutPath "$INSTDIR\lib\synfig\modules" ; Put file there - File /oname=lyr_freetype.dll "src\modules\lyr_freetype\.libs\liblyr_freetype-0.dll" + File /oname=lyr_freetype.dll "src\modules\lyr_freetype\.libs\liblyr_freetype.dll" FileOpen $0 $INSTDIR\etc\synfig_modules.cfg a diff --git a/synfig-core/trunk/src/modules/lyr_std/lyr_std.nsh b/synfig-core/trunk/src/modules/lyr_std/lyr_std.nsh index 8c3df9c..3a0765d 100644 --- a/synfig-core/trunk/src/modules/lyr_std/lyr_std.nsh +++ b/synfig-core/trunk/src/modules/lyr_std/lyr_std.nsh @@ -7,7 +7,7 @@ Section "lyr_std" Sec_lyr_std SetOutPath "$INSTDIR\lib\synfig\modules" ; Put file there - File /oname=lyr_std.dll "src\modules\lyr_std\.libs\liblyr_std-0.dll" + File /oname=lyr_std.dll "src\modules\lyr_std\.libs\liblyr_std.dll" FileOpen $0 $INSTDIR\etc\synfig_modules.cfg a diff --git a/synfig-core/trunk/src/modules/mod_bmp/mod_bmp.nsh b/synfig-core/trunk/src/modules/mod_bmp/mod_bmp.nsh index 0556ef0..9624d4b 100644 --- a/synfig-core/trunk/src/modules/mod_bmp/mod_bmp.nsh +++ b/synfig-core/trunk/src/modules/mod_bmp/mod_bmp.nsh @@ -7,7 +7,7 @@ Section "mod_bmp" Sec_mod_bmp SetOutPath "$INSTDIR\lib\synfig\modules" ; Put file there - File /oname=mod_bmp.dll "src\modules\mod_bmp\.libs\libmod_bmp-0.dll" + File /oname=mod_bmp.dll "src\modules\mod_bmp\.libs\libmod_bmp.dll" FileOpen $0 $INSTDIR\etc\synfig_modules.cfg a diff --git a/synfig-core/trunk/src/modules/mod_dv/mod_dv.nsh b/synfig-core/trunk/src/modules/mod_dv/mod_dv.nsh index 66e7efb..6a0967b 100644 --- a/synfig-core/trunk/src/modules/mod_dv/mod_dv.nsh +++ b/synfig-core/trunk/src/modules/mod_dv/mod_dv.nsh @@ -7,7 +7,7 @@ Section "mod_dv" Sec_mod_dv SetOutPath "$INSTDIR\lib\synfig\modules" ; Put file there - File /oname=mod_dv.dll "src\modules\mod_dv\.libs\libmod_dv-0.dll" + File /oname=mod_dv.dll "src\modules\mod_dv\.libs\libmod_dv.dll" FileOpen $0 $INSTDIR\etc\synfig_modules.cfg a diff --git a/synfig-core/trunk/src/modules/mod_ffmpeg/mod_ffmpeg.nsh b/synfig-core/trunk/src/modules/mod_ffmpeg/mod_ffmpeg.nsh index 68412d8..8a8f197 100644 --- a/synfig-core/trunk/src/modules/mod_ffmpeg/mod_ffmpeg.nsh +++ b/synfig-core/trunk/src/modules/mod_ffmpeg/mod_ffmpeg.nsh @@ -7,7 +7,7 @@ Section "mod_ffmpeg" Sec_mod_ffmpeg SetOutPath "$INSTDIR\lib\synfig\modules" ; Put file there - File /oname=mod_ffmpeg.dll "src\modules\mod_ffmpeg\.libs\libmod_ffmpeg-0.dll" + File /oname=mod_ffmpeg.dll "src\modules\mod_ffmpeg\.libs\libmod_ffmpeg.dll" FileOpen $0 $INSTDIR\etc\synfig_modules.cfg a diff --git a/synfig-core/trunk/src/modules/mod_filter/mod_filter.nsh b/synfig-core/trunk/src/modules/mod_filter/mod_filter.nsh index 617f20b..1ccb3cc 100644 --- a/synfig-core/trunk/src/modules/mod_filter/mod_filter.nsh +++ b/synfig-core/trunk/src/modules/mod_filter/mod_filter.nsh @@ -7,7 +7,7 @@ Section "mod_filter" Sec_mod_filter SetOutPath "$INSTDIR\lib\synfig\modules" ; Put file there - File /oname=mod_filter.dll "src\modules\mod_filter\.libs\libmod_filter-0.dll" + File /oname=mod_filter.dll "src\modules\mod_filter\.libs\libmod_filter.dll" FileOpen $0 $INSTDIR\etc\synfig_modules.cfg a diff --git a/synfig-core/trunk/src/modules/mod_geometry/mod_geometry.nsh b/synfig-core/trunk/src/modules/mod_geometry/mod_geometry.nsh index 316fdf9..f2768e7 100644 --- a/synfig-core/trunk/src/modules/mod_geometry/mod_geometry.nsh +++ b/synfig-core/trunk/src/modules/mod_geometry/mod_geometry.nsh @@ -7,7 +7,7 @@ Section "mod_geometry" Sec_mod_geometry SetOutPath "$INSTDIR\lib\synfig\modules" ; Put file there - File /oname=mod_geometry.dll "src\modules\mod_geometry\.libs\libmod_geometry-0.dll" + File /oname=mod_geometry.dll "src\modules\mod_geometry\.libs\libmod_geometry.dll" FileOpen $0 $INSTDIR\etc\synfig_modules.cfg a diff --git a/synfig-core/trunk/src/modules/mod_gif/mod_gif.nsh b/synfig-core/trunk/src/modules/mod_gif/mod_gif.nsh index a11d38b..17f441b 100644 --- a/synfig-core/trunk/src/modules/mod_gif/mod_gif.nsh +++ b/synfig-core/trunk/src/modules/mod_gif/mod_gif.nsh @@ -7,7 +7,7 @@ Section "mod_gif" Sec_mod_gif SetOutPath "$INSTDIR\lib\synfig\modules" ; Put file there - File /oname=mod_gif.dll "src\modules\mod_gif\.libs\libmod_gif-0.dll" + File /oname=mod_gif.dll "src\modules\mod_gif\.libs\libmod_gif.dll" FileOpen $0 $INSTDIR\etc\synfig_modules.cfg a diff --git a/synfig-core/trunk/src/modules/mod_gradient/mod_gradient.nsh b/synfig-core/trunk/src/modules/mod_gradient/mod_gradient.nsh index c5eadc8..6d8f495 100644 --- a/synfig-core/trunk/src/modules/mod_gradient/mod_gradient.nsh +++ b/synfig-core/trunk/src/modules/mod_gradient/mod_gradient.nsh @@ -7,7 +7,7 @@ Section "mod_gradient" Sec_mod_gradient SetOutPath "$INSTDIR\lib\synfig\modules" ; Put file there - File /oname=mod_gradient.dll "src\modules\mod_gradient\.libs\libmod_gradient-0.dll" + File /oname=mod_gradient.dll "src\modules\mod_gradient\.libs\libmod_gradient.dll" FileOpen $0 $INSTDIR\etc\synfig_modules.cfg a diff --git a/synfig-core/trunk/src/modules/mod_imagemagick/mod_imagemagick.nsh b/synfig-core/trunk/src/modules/mod_imagemagick/mod_imagemagick.nsh index 4db24bc..b4a1d71 100644 --- a/synfig-core/trunk/src/modules/mod_imagemagick/mod_imagemagick.nsh +++ b/synfig-core/trunk/src/modules/mod_imagemagick/mod_imagemagick.nsh @@ -7,7 +7,7 @@ Section "mod_imagemagick" Sec_mod_imagemagick SetOutPath "$INSTDIR\lib\synfig\modules" ; Put file there - File /oname=mod_imagemagick.dll "src\modules\mod_imagemagick\.libs\libmod_imagemagick-0.dll" + File /oname=mod_imagemagick.dll "src\modules\mod_imagemagick\.libs\libmod_imagemagick.dll" FileOpen $0 $INSTDIR\etc\synfig_modules.cfg a diff --git a/synfig-core/trunk/src/modules/mod_jpeg/mod_jpeg.nsh b/synfig-core/trunk/src/modules/mod_jpeg/mod_jpeg.nsh index 66e19c7..2468ddb 100644 --- a/synfig-core/trunk/src/modules/mod_jpeg/mod_jpeg.nsh +++ b/synfig-core/trunk/src/modules/mod_jpeg/mod_jpeg.nsh @@ -7,7 +7,7 @@ Section "mod_jpeg" Sec_mod_jpeg SetOutPath "$INSTDIR\lib\synfig\modules" ; Put file there - File /oname=mod_jpeg.dll "src\modules\mod_jpeg\.libs\libmod_jpeg-0.dll" + File /oname=mod_jpeg.dll "src\modules\mod_jpeg\.libs\libmod_jpeg.dll" FileOpen $0 $INSTDIR\etc\synfig_modules.cfg a diff --git a/synfig-core/trunk/src/modules/mod_libavcodec/mod_libavcodec.nsh b/synfig-core/trunk/src/modules/mod_libavcodec/mod_libavcodec.nsh index 2ced97c..12778b6 100644 --- a/synfig-core/trunk/src/modules/mod_libavcodec/mod_libavcodec.nsh +++ b/synfig-core/trunk/src/modules/mod_libavcodec/mod_libavcodec.nsh @@ -7,7 +7,7 @@ Section "mod_libavcodec" Sec_mod_libavcodec SetOutPath "$INSTDIR\lib\synfig\modules" ; Put file there - File /oname=mod_libavcodec.dll "src\modules\mod_libavcodec\.libs\libmod_libavcodec-0.dll" + File /oname=mod_libavcodec.dll "src\modules\mod_libavcodec\.libs\libmod_libavcodec.dll" FileOpen $0 $INSTDIR\etc\synfig_modules.cfg a diff --git a/synfig-core/trunk/src/modules/mod_magickpp/mod_magickpp.nsh b/synfig-core/trunk/src/modules/mod_magickpp/mod_magickpp.nsh index f186a91..bd37688 100644 --- a/synfig-core/trunk/src/modules/mod_magickpp/mod_magickpp.nsh +++ b/synfig-core/trunk/src/modules/mod_magickpp/mod_magickpp.nsh @@ -1,6 +1,6 @@ Section "mod_magickpp" Sec_mod_magickpp SetOutPath "$INSTDIR\lib\synfig\modules" - File /oname=mod_magickpp.dll "src\modules\mod_magickpp\.libs\libmod_magickpp-0.dll" + File /oname=mod_magickpp.dll "src\modules\mod_magickpp\.libs\libmod_magickpp.dll" FileOpen $0 $INSTDIR\etc\synfig_modules.cfg a FileSeek $0 0 END FileWrite $0 "mod_magickpp" diff --git a/synfig-core/trunk/src/modules/mod_mng/mod_mng.nsh b/synfig-core/trunk/src/modules/mod_mng/mod_mng.nsh index 3e85d80..13c11a0 100644 --- a/synfig-core/trunk/src/modules/mod_mng/mod_mng.nsh +++ b/synfig-core/trunk/src/modules/mod_mng/mod_mng.nsh @@ -1,6 +1,6 @@ Section "mod_mng" Sec_mod_mng SetOutPath "$INSTDIR\lib\synfig\modules" - File /oname=mod_mng.dll "src\modules\mod_mng\.libs\libmod_mng-0.dll" + File /oname=mod_mng.dll "src\modules\mod_mng\.libs\libmod_mng.dll" FileOpen $0 $INSTDIR\etc\synfig_modules.cfg a FileSeek $0 0 END FileWrite $0 "mod_mng" diff --git a/synfig-core/trunk/src/modules/mod_noise/mod_noise.nsh b/synfig-core/trunk/src/modules/mod_noise/mod_noise.nsh index 01efeda..3521694 100644 --- a/synfig-core/trunk/src/modules/mod_noise/mod_noise.nsh +++ b/synfig-core/trunk/src/modules/mod_noise/mod_noise.nsh @@ -7,7 +7,7 @@ Section "mod_noise" Sec_mod_noise SetOutPath "$INSTDIR\lib\synfig\modules" ; Put file there - File /oname=mod_noise.dll "src\modules\mod_noise\.libs\libmod_noise-0.dll" + File /oname=mod_noise.dll "src\modules\mod_noise\.libs\libmod_noise.dll" FileOpen $0 $INSTDIR\etc\synfig_modules.cfg a diff --git a/synfig-core/trunk/src/modules/mod_openexr/mod_openexr.nsh b/synfig-core/trunk/src/modules/mod_openexr/mod_openexr.nsh index ce43164..b11034b 100644 --- a/synfig-core/trunk/src/modules/mod_openexr/mod_openexr.nsh +++ b/synfig-core/trunk/src/modules/mod_openexr/mod_openexr.nsh @@ -7,7 +7,7 @@ Section "mod_openexr" Sec_mod_openexr SetOutPath "$INSTDIR\lib\synfig\modules" ; Put file there - File /oname=mod_openexr.dll "src\modules\mod_openexr\.libs\libmod_openexr-0.dll" + File /oname=mod_openexr.dll "src\modules\mod_openexr\.libs\libmod_openexr.dll" SetOutPath "$INSTDIR\bin" File /oname=libHalf-4.dll "src\modules\mod_openexr\.libs\libHalf-4.dll" diff --git a/synfig-core/trunk/src/modules/mod_particle/mod_particle.nsh b/synfig-core/trunk/src/modules/mod_particle/mod_particle.nsh index 908cdde..faff380 100644 --- a/synfig-core/trunk/src/modules/mod_particle/mod_particle.nsh +++ b/synfig-core/trunk/src/modules/mod_particle/mod_particle.nsh @@ -7,7 +7,7 @@ Section "mod_particle" Sec_mod_particle SetOutPath "$INSTDIR\lib\synfig\modules" ; Put file there - File /oname=mod_particle.dll "src\modules\mod_particle\.libs\libmod_particle-0.dll" + File /oname=mod_particle.dll "src\modules\mod_particle\.libs\libmod_particle.dll" FileOpen $0 $INSTDIR\etc\synfig_modules.cfg a diff --git a/synfig-core/trunk/src/modules/mod_png/mod_png.nsh b/synfig-core/trunk/src/modules/mod_png/mod_png.nsh index 84df93f..aaa7bbd 100644 --- a/synfig-core/trunk/src/modules/mod_png/mod_png.nsh +++ b/synfig-core/trunk/src/modules/mod_png/mod_png.nsh @@ -7,7 +7,7 @@ Section "mod_png" Sec_mod_png SetOutPath "$INSTDIR\lib\synfig\modules" ; Put file there - File /oname=mod_png.dll "src\modules\mod_png\.libs\libmod_png-0.dll" + File /oname=mod_png.dll "src\modules\mod_png\.libs\libmod_png.dll" FileOpen $0 $INSTDIR\etc\synfig_modules.cfg a diff --git a/synfig-core/trunk/src/modules/mod_ppm/mod_ppm.nsh b/synfig-core/trunk/src/modules/mod_ppm/mod_ppm.nsh index 92cce6f..ddf2c89 100644 --- a/synfig-core/trunk/src/modules/mod_ppm/mod_ppm.nsh +++ b/synfig-core/trunk/src/modules/mod_ppm/mod_ppm.nsh @@ -7,7 +7,7 @@ Section "mod_ppm" Sec_mod_ppm SetOutPath "$INSTDIR\lib\synfig\modules" ; Put file there - File /oname=mod_ppm.dll "src\modules\mod_ppm\.libs\libmod_ppm-0.dll" + File /oname=mod_ppm.dll "src\modules\mod_ppm\.libs\libmod_ppm.dll" FileOpen $0 $INSTDIR\etc\synfig_modules.cfg a diff --git a/synfig-core/trunk/src/modules/mod_yuv420p/mod_yuv420p.nsh b/synfig-core/trunk/src/modules/mod_yuv420p/mod_yuv420p.nsh index 5376a6e..a7bb68b 100644 --- a/synfig-core/trunk/src/modules/mod_yuv420p/mod_yuv420p.nsh +++ b/synfig-core/trunk/src/modules/mod_yuv420p/mod_yuv420p.nsh @@ -7,7 +7,7 @@ Section "mod_yuv420p" Sec_mod_yuv420p SetOutPath "$INSTDIR\lib\synfig\modules" ; Put file there - File /oname=mod_yuv420p.dll "src\modules\mod_yuv420p\.libs\libmod_yuv420p-0.dll" + File /oname=mod_yuv420p.dll "src\modules\mod_yuv420p\.libs\libmod_yuv420p.dll" FileOpen $0 $INSTDIR\etc\synfig_modules.cfg a diff --git a/synfig-core/trunk/src/modules/template.nsh b/synfig-core/trunk/src/modules/template.nsh index bc6ede8..d702aa5 100644 --- a/synfig-core/trunk/src/modules/template.nsh +++ b/synfig-core/trunk/src/modules/template.nsh @@ -7,7 +7,7 @@ Section "@MODNAME@" Sec_@MODNAME@ SetOutPath "$INSTDIR\lib\synfig\modules" ; Put file there - File /oname=@MODNAME@.dll "src\modules\@MODNAME@\.libs\lib@MODNAME@-0.dll" + File /oname=@MODNAME@.dll "src\modules\@MODNAME@\.libs\lib@MODNAME@.dll" FileOpen $0 $INSTDIR\etc\synfig_modules.cfg a -- 2.7.4