From ff9ed7c6c97639724efbe1beee356c9c8011d19a Mon Sep 17 00:00:00 2001 From: darco Date: Sat, 29 Oct 2005 23:19:43 +0000 Subject: [PATCH] meh git-svn-id: http://svn.voria.com/code@28 1f10aa63-cdf2-0310-b900-c93c546f37ac --- synfig-core/trunk/bootstrap | 4 ++- .../src/modules/lyr_freetype/lyr_freetype.nsh | 21 ++++++++++++ .../src/modules/lyr_freetype/unlyr_freetype.nsh | 5 +++ .../trunk/src/modules/lyr_std/unlyr_std.nsh | 5 +++ synfig-core/trunk/src/modules/mod_bmp/mod_bmp.nsh | 21 ++++++++++++ .../trunk/src/modules/mod_bmp/unmod_bmp.nsh | 5 +++ synfig-core/trunk/src/modules/mod_dv/mod_dv.nsh | 21 ++++++++++++ synfig-core/trunk/src/modules/mod_dv/unmod_dv.nsh | 5 +++ .../trunk/src/modules/mod_ffmpeg/mod_ffmpeg.nsh | 21 ++++++++++++ .../trunk/src/modules/mod_ffmpeg/unmod_ffmpeg.nsh | 5 +++ .../trunk/src/modules/mod_filter/mod_filter.nsh | 21 ++++++++++++ .../trunk/src/modules/mod_filter/unmod_filter.nsh | 5 +++ .../src/modules/mod_geometry/mod_geometry.nsh | 21 ++++++++++++ .../src/modules/mod_geometry/unmod_geometry.nsh | 5 +++ synfig-core/trunk/src/modules/mod_gif/mod_gif.nsh | 21 ++++++++++++ .../trunk/src/modules/mod_gif/unmod_gif.nsh | 5 +++ .../src/modules/mod_gradient/mod_gradient.nsh | 21 ++++++++++++ .../src/modules/mod_gradient/unmod_gradient.nsh | 5 +++ .../modules/mod_imagemagick/mod_imagemagick.nsh | 21 ++++++++++++ .../modules/mod_imagemagick/unmod_imagemagick.nsh | 5 +++ .../trunk/src/modules/mod_jpeg/mod_jpeg.nsh | 21 ++++++++++++ .../trunk/src/modules/mod_jpeg/unmod_jpeg.nsh | 5 +++ .../src/modules/mod_libavcodec/mod_libavcodec.nsh | 21 ++++++++++++ .../modules/mod_libavcodec/unmod_libavcodec.nsh | 5 +++ .../trunk/src/modules/mod_noise/mod_noise.nsh | 21 ++++++++++++ .../trunk/src/modules/mod_noise/unmod_noise.nsh | 5 +++ .../trunk/src/modules/mod_openexr/mod_openexr.nsh | 21 ++++++++++++ .../src/modules/mod_openexr/unmod_openexr.nsh | 5 +++ .../src/modules/mod_particle/mod_particle.nsh | 21 ++++++++++++ .../src/modules/mod_particle/unmod_particle.nsh | 5 +++ synfig-core/trunk/src/modules/mod_png/mod_png.nsh | 21 ++++++++++++ .../trunk/src/modules/mod_png/unmod_png.nsh | 5 +++ synfig-core/trunk/src/modules/mod_ppm/mod_ppm.nsh | 21 ++++++++++++ .../trunk/src/modules/mod_ppm/unmod_ppm.nsh | 5 +++ .../trunk/src/modules/mod_yuv420p/mod_yuv420p.nsh | 21 ++++++++++++ .../src/modules/mod_yuv420p/unmod_yuv420p.nsh | 5 +++ synfig-core/trunk/src/modules/template.nsh | 21 ++++++++++++ synfig-core/trunk/src/modules/untemplate.nsh | 5 +++ synfig-core/trunk/src/synfig/synfig.nsh | 38 +++++++++++----------- synfig-core/trunk/src/tool/tool.nsh | 38 +++++++++++----------- synfig-core/trunk/synfig.pc.in | 2 +- synfig-core/trunk/win32build.sh | 9 +++-- synfig-core/trunk/win32inst.nsi.in | 2 +- 43 files changed, 522 insertions(+), 44 deletions(-) create mode 100644 synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.nsh create mode 100644 synfig-core/trunk/src/modules/lyr_freetype/unlyr_freetype.nsh create mode 100644 synfig-core/trunk/src/modules/lyr_std/unlyr_std.nsh create mode 100644 synfig-core/trunk/src/modules/mod_bmp/mod_bmp.nsh create mode 100644 synfig-core/trunk/src/modules/mod_bmp/unmod_bmp.nsh create mode 100644 synfig-core/trunk/src/modules/mod_dv/mod_dv.nsh create mode 100644 synfig-core/trunk/src/modules/mod_dv/unmod_dv.nsh create mode 100644 synfig-core/trunk/src/modules/mod_ffmpeg/mod_ffmpeg.nsh create mode 100644 synfig-core/trunk/src/modules/mod_ffmpeg/unmod_ffmpeg.nsh create mode 100644 synfig-core/trunk/src/modules/mod_filter/mod_filter.nsh create mode 100644 synfig-core/trunk/src/modules/mod_filter/unmod_filter.nsh create mode 100644 synfig-core/trunk/src/modules/mod_geometry/mod_geometry.nsh create mode 100644 synfig-core/trunk/src/modules/mod_geometry/unmod_geometry.nsh create mode 100644 synfig-core/trunk/src/modules/mod_gif/mod_gif.nsh create mode 100644 synfig-core/trunk/src/modules/mod_gif/unmod_gif.nsh create mode 100644 synfig-core/trunk/src/modules/mod_gradient/mod_gradient.nsh create mode 100644 synfig-core/trunk/src/modules/mod_gradient/unmod_gradient.nsh create mode 100644 synfig-core/trunk/src/modules/mod_imagemagick/mod_imagemagick.nsh create mode 100644 synfig-core/trunk/src/modules/mod_imagemagick/unmod_imagemagick.nsh create mode 100644 synfig-core/trunk/src/modules/mod_jpeg/mod_jpeg.nsh create mode 100644 synfig-core/trunk/src/modules/mod_jpeg/unmod_jpeg.nsh create mode 100644 synfig-core/trunk/src/modules/mod_libavcodec/mod_libavcodec.nsh create mode 100644 synfig-core/trunk/src/modules/mod_libavcodec/unmod_libavcodec.nsh create mode 100644 synfig-core/trunk/src/modules/mod_noise/mod_noise.nsh create mode 100644 synfig-core/trunk/src/modules/mod_noise/unmod_noise.nsh create mode 100644 synfig-core/trunk/src/modules/mod_openexr/mod_openexr.nsh create mode 100644 synfig-core/trunk/src/modules/mod_openexr/unmod_openexr.nsh create mode 100644 synfig-core/trunk/src/modules/mod_particle/mod_particle.nsh create mode 100644 synfig-core/trunk/src/modules/mod_particle/unmod_particle.nsh create mode 100644 synfig-core/trunk/src/modules/mod_png/mod_png.nsh create mode 100644 synfig-core/trunk/src/modules/mod_png/unmod_png.nsh create mode 100644 synfig-core/trunk/src/modules/mod_ppm/mod_ppm.nsh create mode 100644 synfig-core/trunk/src/modules/mod_ppm/unmod_ppm.nsh create mode 100644 synfig-core/trunk/src/modules/mod_yuv420p/mod_yuv420p.nsh create mode 100644 synfig-core/trunk/src/modules/mod_yuv420p/unmod_yuv420p.nsh create mode 100644 synfig-core/trunk/src/modules/template.nsh create mode 100644 synfig-core/trunk/src/modules/untemplate.nsh diff --git a/synfig-core/trunk/bootstrap b/synfig-core/trunk/bootstrap index 85fb254..a44033c 100755 --- a/synfig-core/trunk/bootstrap +++ b/synfig-core/trunk/bootstrap @@ -218,7 +218,9 @@ set +x ( output Patching libtool... patch config/ltmain.sh config/ltmain.patch -) || +) || true + +false && { # Something went wrong... set +x diff --git a/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.nsh b/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.nsh new file mode 100644 index 0000000..a70917f --- /dev/null +++ b/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.nsh @@ -0,0 +1,21 @@ +; The stuff to install +Section "lyr_freetype" Sec_lyr_freetype + +; SectionIn RO + + ; Set output path to the installation directory. + SetOutPath "$INSTDIR\lib\sinfg\modules" + + ; Put file there + File /oname=lyr_freetype.dll "src\modules\lyr_freetype\.libs\liblyr_freetype-0.dll" + + + FileOpen $0 $INSTDIR\etc\synfig_modules.cfg a + FileSeek $0 0 END + FileWrite $0 "lyr_freetype" + FileWriteByte $0 "13" + FileWriteByte $0 "10" + FileClose $0 + +SectionEnd + diff --git a/synfig-core/trunk/src/modules/lyr_freetype/unlyr_freetype.nsh b/synfig-core/trunk/src/modules/lyr_freetype/unlyr_freetype.nsh new file mode 100644 index 0000000..63190df --- /dev/null +++ b/synfig-core/trunk/src/modules/lyr_freetype/unlyr_freetype.nsh @@ -0,0 +1,5 @@ +Section "un.lyr_freetype" + Delete "$INSTDIR\lib\sinfg\modules\lyr_freetype.dll" + RMDir "$INSTDIR" +SectionEnd + diff --git a/synfig-core/trunk/src/modules/lyr_std/unlyr_std.nsh b/synfig-core/trunk/src/modules/lyr_std/unlyr_std.nsh new file mode 100644 index 0000000..bbf1017 --- /dev/null +++ b/synfig-core/trunk/src/modules/lyr_std/unlyr_std.nsh @@ -0,0 +1,5 @@ +Section "un.lyr_std" + Delete "$INSTDIR\lib\sinfg\modules\lyr_std.dll" + RMDir "$INSTDIR" +SectionEnd + diff --git a/synfig-core/trunk/src/modules/mod_bmp/mod_bmp.nsh b/synfig-core/trunk/src/modules/mod_bmp/mod_bmp.nsh new file mode 100644 index 0000000..8fe1207 --- /dev/null +++ b/synfig-core/trunk/src/modules/mod_bmp/mod_bmp.nsh @@ -0,0 +1,21 @@ +; The stuff to install +Section "mod_bmp" Sec_mod_bmp + +; SectionIn RO + + ; Set output path to the installation directory. + SetOutPath "$INSTDIR\lib\sinfg\modules" + + ; Put file there + File /oname=mod_bmp.dll "src\modules\mod_bmp\.libs\libmod_bmp-0.dll" + + + FileOpen $0 $INSTDIR\etc\synfig_modules.cfg a + FileSeek $0 0 END + FileWrite $0 "mod_bmp" + FileWriteByte $0 "13" + FileWriteByte $0 "10" + FileClose $0 + +SectionEnd + diff --git a/synfig-core/trunk/src/modules/mod_bmp/unmod_bmp.nsh b/synfig-core/trunk/src/modules/mod_bmp/unmod_bmp.nsh new file mode 100644 index 0000000..af1a8b3 --- /dev/null +++ b/synfig-core/trunk/src/modules/mod_bmp/unmod_bmp.nsh @@ -0,0 +1,5 @@ +Section "un.mod_bmp" + Delete "$INSTDIR\lib\sinfg\modules\mod_bmp.dll" + RMDir "$INSTDIR" +SectionEnd + diff --git a/synfig-core/trunk/src/modules/mod_dv/mod_dv.nsh b/synfig-core/trunk/src/modules/mod_dv/mod_dv.nsh new file mode 100644 index 0000000..d0a7ea1 --- /dev/null +++ b/synfig-core/trunk/src/modules/mod_dv/mod_dv.nsh @@ -0,0 +1,21 @@ +; The stuff to install +Section "mod_dv" Sec_mod_dv + +; SectionIn RO + + ; Set output path to the installation directory. + SetOutPath "$INSTDIR\lib\sinfg\modules" + + ; Put file there + File /oname=mod_dv.dll "src\modules\mod_dv\.libs\libmod_dv-0.dll" + + + FileOpen $0 $INSTDIR\etc\synfig_modules.cfg a + FileSeek $0 0 END + FileWrite $0 "mod_dv" + FileWriteByte $0 "13" + FileWriteByte $0 "10" + FileClose $0 + +SectionEnd + diff --git a/synfig-core/trunk/src/modules/mod_dv/unmod_dv.nsh b/synfig-core/trunk/src/modules/mod_dv/unmod_dv.nsh new file mode 100644 index 0000000..04ed4af --- /dev/null +++ b/synfig-core/trunk/src/modules/mod_dv/unmod_dv.nsh @@ -0,0 +1,5 @@ +Section "un.mod_dv" + Delete "$INSTDIR\lib\sinfg\modules\mod_dv.dll" + RMDir "$INSTDIR" +SectionEnd + diff --git a/synfig-core/trunk/src/modules/mod_ffmpeg/mod_ffmpeg.nsh b/synfig-core/trunk/src/modules/mod_ffmpeg/mod_ffmpeg.nsh new file mode 100644 index 0000000..8a941ef --- /dev/null +++ b/synfig-core/trunk/src/modules/mod_ffmpeg/mod_ffmpeg.nsh @@ -0,0 +1,21 @@ +; The stuff to install +Section "mod_ffmpeg" Sec_mod_ffmpeg + +; SectionIn RO + + ; Set output path to the installation directory. + SetOutPath "$INSTDIR\lib\sinfg\modules" + + ; Put file there + File /oname=mod_ffmpeg.dll "src\modules\mod_ffmpeg\.libs\libmod_ffmpeg-0.dll" + + + FileOpen $0 $INSTDIR\etc\synfig_modules.cfg a + FileSeek $0 0 END + FileWrite $0 "mod_ffmpeg" + FileWriteByte $0 "13" + FileWriteByte $0 "10" + FileClose $0 + +SectionEnd + diff --git a/synfig-core/trunk/src/modules/mod_ffmpeg/unmod_ffmpeg.nsh b/synfig-core/trunk/src/modules/mod_ffmpeg/unmod_ffmpeg.nsh new file mode 100644 index 0000000..688d3dc --- /dev/null +++ b/synfig-core/trunk/src/modules/mod_ffmpeg/unmod_ffmpeg.nsh @@ -0,0 +1,5 @@ +Section "un.mod_ffmpeg" + Delete "$INSTDIR\lib\sinfg\modules\mod_ffmpeg.dll" + RMDir "$INSTDIR" +SectionEnd + diff --git a/synfig-core/trunk/src/modules/mod_filter/mod_filter.nsh b/synfig-core/trunk/src/modules/mod_filter/mod_filter.nsh new file mode 100644 index 0000000..3f2d7ab --- /dev/null +++ b/synfig-core/trunk/src/modules/mod_filter/mod_filter.nsh @@ -0,0 +1,21 @@ +; The stuff to install +Section "mod_filter" Sec_mod_filter + +; SectionIn RO + + ; Set output path to the installation directory. + SetOutPath "$INSTDIR\lib\sinfg\modules" + + ; Put file there + File /oname=mod_filter.dll "src\modules\mod_filter\.libs\libmod_filter-0.dll" + + + FileOpen $0 $INSTDIR\etc\synfig_modules.cfg a + FileSeek $0 0 END + FileWrite $0 "mod_filter" + FileWriteByte $0 "13" + FileWriteByte $0 "10" + FileClose $0 + +SectionEnd + diff --git a/synfig-core/trunk/src/modules/mod_filter/unmod_filter.nsh b/synfig-core/trunk/src/modules/mod_filter/unmod_filter.nsh new file mode 100644 index 0000000..26dcfd3 --- /dev/null +++ b/synfig-core/trunk/src/modules/mod_filter/unmod_filter.nsh @@ -0,0 +1,5 @@ +Section "un.mod_filter" + Delete "$INSTDIR\lib\sinfg\modules\mod_filter.dll" + RMDir "$INSTDIR" +SectionEnd + diff --git a/synfig-core/trunk/src/modules/mod_geometry/mod_geometry.nsh b/synfig-core/trunk/src/modules/mod_geometry/mod_geometry.nsh new file mode 100644 index 0000000..8ba8781 --- /dev/null +++ b/synfig-core/trunk/src/modules/mod_geometry/mod_geometry.nsh @@ -0,0 +1,21 @@ +; The stuff to install +Section "mod_geometry" Sec_mod_geometry + +; SectionIn RO + + ; Set output path to the installation directory. + SetOutPath "$INSTDIR\lib\sinfg\modules" + + ; Put file there + File /oname=mod_geometry.dll "src\modules\mod_geometry\.libs\libmod_geometry-0.dll" + + + FileOpen $0 $INSTDIR\etc\synfig_modules.cfg a + FileSeek $0 0 END + FileWrite $0 "mod_geometry" + FileWriteByte $0 "13" + FileWriteByte $0 "10" + FileClose $0 + +SectionEnd + diff --git a/synfig-core/trunk/src/modules/mod_geometry/unmod_geometry.nsh b/synfig-core/trunk/src/modules/mod_geometry/unmod_geometry.nsh new file mode 100644 index 0000000..aca9f6a --- /dev/null +++ b/synfig-core/trunk/src/modules/mod_geometry/unmod_geometry.nsh @@ -0,0 +1,5 @@ +Section "un.mod_geometry" + Delete "$INSTDIR\lib\sinfg\modules\mod_geometry.dll" + RMDir "$INSTDIR" +SectionEnd + diff --git a/synfig-core/trunk/src/modules/mod_gif/mod_gif.nsh b/synfig-core/trunk/src/modules/mod_gif/mod_gif.nsh new file mode 100644 index 0000000..14ce62e --- /dev/null +++ b/synfig-core/trunk/src/modules/mod_gif/mod_gif.nsh @@ -0,0 +1,21 @@ +; The stuff to install +Section "mod_gif" Sec_mod_gif + +; SectionIn RO + + ; Set output path to the installation directory. + SetOutPath "$INSTDIR\lib\sinfg\modules" + + ; Put file there + File /oname=mod_gif.dll "src\modules\mod_gif\.libs\libmod_gif-0.dll" + + + FileOpen $0 $INSTDIR\etc\synfig_modules.cfg a + FileSeek $0 0 END + FileWrite $0 "mod_gif" + FileWriteByte $0 "13" + FileWriteByte $0 "10" + FileClose $0 + +SectionEnd + diff --git a/synfig-core/trunk/src/modules/mod_gif/unmod_gif.nsh b/synfig-core/trunk/src/modules/mod_gif/unmod_gif.nsh new file mode 100644 index 0000000..a1ccb2b --- /dev/null +++ b/synfig-core/trunk/src/modules/mod_gif/unmod_gif.nsh @@ -0,0 +1,5 @@ +Section "un.mod_gif" + Delete "$INSTDIR\lib\sinfg\modules\mod_gif.dll" + RMDir "$INSTDIR" +SectionEnd + diff --git a/synfig-core/trunk/src/modules/mod_gradient/mod_gradient.nsh b/synfig-core/trunk/src/modules/mod_gradient/mod_gradient.nsh new file mode 100644 index 0000000..a27f512 --- /dev/null +++ b/synfig-core/trunk/src/modules/mod_gradient/mod_gradient.nsh @@ -0,0 +1,21 @@ +; The stuff to install +Section "mod_gradient" Sec_mod_gradient + +; SectionIn RO + + ; Set output path to the installation directory. + SetOutPath "$INSTDIR\lib\sinfg\modules" + + ; Put file there + File /oname=mod_gradient.dll "src\modules\mod_gradient\.libs\libmod_gradient-0.dll" + + + FileOpen $0 $INSTDIR\etc\synfig_modules.cfg a + FileSeek $0 0 END + FileWrite $0 "mod_gradient" + FileWriteByte $0 "13" + FileWriteByte $0 "10" + FileClose $0 + +SectionEnd + diff --git a/synfig-core/trunk/src/modules/mod_gradient/unmod_gradient.nsh b/synfig-core/trunk/src/modules/mod_gradient/unmod_gradient.nsh new file mode 100644 index 0000000..428ccf5 --- /dev/null +++ b/synfig-core/trunk/src/modules/mod_gradient/unmod_gradient.nsh @@ -0,0 +1,5 @@ +Section "un.mod_gradient" + Delete "$INSTDIR\lib\sinfg\modules\mod_gradient.dll" + RMDir "$INSTDIR" +SectionEnd + diff --git a/synfig-core/trunk/src/modules/mod_imagemagick/mod_imagemagick.nsh b/synfig-core/trunk/src/modules/mod_imagemagick/mod_imagemagick.nsh new file mode 100644 index 0000000..ebabff6 --- /dev/null +++ b/synfig-core/trunk/src/modules/mod_imagemagick/mod_imagemagick.nsh @@ -0,0 +1,21 @@ +; The stuff to install +Section "mod_imagemagick" Sec_mod_imagemagick + +; SectionIn RO + + ; Set output path to the installation directory. + SetOutPath "$INSTDIR\lib\sinfg\modules" + + ; Put file there + File /oname=mod_imagemagick.dll "src\modules\mod_imagemagick\.libs\libmod_imagemagick-0.dll" + + + FileOpen $0 $INSTDIR\etc\synfig_modules.cfg a + FileSeek $0 0 END + FileWrite $0 "mod_imagemagick" + FileWriteByte $0 "13" + FileWriteByte $0 "10" + FileClose $0 + +SectionEnd + diff --git a/synfig-core/trunk/src/modules/mod_imagemagick/unmod_imagemagick.nsh b/synfig-core/trunk/src/modules/mod_imagemagick/unmod_imagemagick.nsh new file mode 100644 index 0000000..c09cd45 --- /dev/null +++ b/synfig-core/trunk/src/modules/mod_imagemagick/unmod_imagemagick.nsh @@ -0,0 +1,5 @@ +Section "un.mod_imagemagick" + Delete "$INSTDIR\lib\sinfg\modules\mod_imagemagick.dll" + RMDir "$INSTDIR" +SectionEnd + diff --git a/synfig-core/trunk/src/modules/mod_jpeg/mod_jpeg.nsh b/synfig-core/trunk/src/modules/mod_jpeg/mod_jpeg.nsh new file mode 100644 index 0000000..08f07ca --- /dev/null +++ b/synfig-core/trunk/src/modules/mod_jpeg/mod_jpeg.nsh @@ -0,0 +1,21 @@ +; The stuff to install +Section "mod_jpeg" Sec_mod_jpeg + +; SectionIn RO + + ; Set output path to the installation directory. + SetOutPath "$INSTDIR\lib\sinfg\modules" + + ; Put file there + File /oname=mod_jpeg.dll "src\modules\mod_jpeg\.libs\libmod_jpeg-0.dll" + + + FileOpen $0 $INSTDIR\etc\synfig_modules.cfg a + FileSeek $0 0 END + FileWrite $0 "mod_jpeg" + FileWriteByte $0 "13" + FileWriteByte $0 "10" + FileClose $0 + +SectionEnd + diff --git a/synfig-core/trunk/src/modules/mod_jpeg/unmod_jpeg.nsh b/synfig-core/trunk/src/modules/mod_jpeg/unmod_jpeg.nsh new file mode 100644 index 0000000..0121537 --- /dev/null +++ b/synfig-core/trunk/src/modules/mod_jpeg/unmod_jpeg.nsh @@ -0,0 +1,5 @@ +Section "un.mod_jpeg" + Delete "$INSTDIR\lib\sinfg\modules\mod_jpeg.dll" + RMDir "$INSTDIR" +SectionEnd + diff --git a/synfig-core/trunk/src/modules/mod_libavcodec/mod_libavcodec.nsh b/synfig-core/trunk/src/modules/mod_libavcodec/mod_libavcodec.nsh new file mode 100644 index 0000000..abc1485 --- /dev/null +++ b/synfig-core/trunk/src/modules/mod_libavcodec/mod_libavcodec.nsh @@ -0,0 +1,21 @@ +; The stuff to install +Section "mod_libavcodec" Sec_mod_libavcodec + +; SectionIn RO + + ; Set output path to the installation directory. + SetOutPath "$INSTDIR\lib\sinfg\modules" + + ; Put file there + File /oname=mod_libavcodec.dll "src\modules\mod_libavcodec\.libs\libmod_libavcodec-0.dll" + + + FileOpen $0 $INSTDIR\etc\synfig_modules.cfg a + FileSeek $0 0 END + FileWrite $0 "mod_libavcodec" + FileWriteByte $0 "13" + FileWriteByte $0 "10" + FileClose $0 + +SectionEnd + diff --git a/synfig-core/trunk/src/modules/mod_libavcodec/unmod_libavcodec.nsh b/synfig-core/trunk/src/modules/mod_libavcodec/unmod_libavcodec.nsh new file mode 100644 index 0000000..a873db8 --- /dev/null +++ b/synfig-core/trunk/src/modules/mod_libavcodec/unmod_libavcodec.nsh @@ -0,0 +1,5 @@ +Section "un.mod_libavcodec" + Delete "$INSTDIR\lib\sinfg\modules\mod_libavcodec.dll" + RMDir "$INSTDIR" +SectionEnd + diff --git a/synfig-core/trunk/src/modules/mod_noise/mod_noise.nsh b/synfig-core/trunk/src/modules/mod_noise/mod_noise.nsh new file mode 100644 index 0000000..ca6da3d --- /dev/null +++ b/synfig-core/trunk/src/modules/mod_noise/mod_noise.nsh @@ -0,0 +1,21 @@ +; The stuff to install +Section "mod_noise" Sec_mod_noise + +; SectionIn RO + + ; Set output path to the installation directory. + SetOutPath "$INSTDIR\lib\sinfg\modules" + + ; Put file there + File /oname=mod_noise.dll "src\modules\mod_noise\.libs\libmod_noise-0.dll" + + + FileOpen $0 $INSTDIR\etc\synfig_modules.cfg a + FileSeek $0 0 END + FileWrite $0 "mod_noise" + FileWriteByte $0 "13" + FileWriteByte $0 "10" + FileClose $0 + +SectionEnd + diff --git a/synfig-core/trunk/src/modules/mod_noise/unmod_noise.nsh b/synfig-core/trunk/src/modules/mod_noise/unmod_noise.nsh new file mode 100644 index 0000000..ae85c93 --- /dev/null +++ b/synfig-core/trunk/src/modules/mod_noise/unmod_noise.nsh @@ -0,0 +1,5 @@ +Section "un.mod_noise" + Delete "$INSTDIR\lib\sinfg\modules\mod_noise.dll" + RMDir "$INSTDIR" +SectionEnd + diff --git a/synfig-core/trunk/src/modules/mod_openexr/mod_openexr.nsh b/synfig-core/trunk/src/modules/mod_openexr/mod_openexr.nsh new file mode 100644 index 0000000..819e71f --- /dev/null +++ b/synfig-core/trunk/src/modules/mod_openexr/mod_openexr.nsh @@ -0,0 +1,21 @@ +; The stuff to install +Section "mod_openexr" Sec_mod_openexr + +; SectionIn RO + + ; Set output path to the installation directory. + SetOutPath "$INSTDIR\lib\sinfg\modules" + + ; Put file there + File /oname=mod_openexr.dll "src\modules\mod_openexr\.libs\libmod_openexr-0.dll" + + + FileOpen $0 $INSTDIR\etc\synfig_modules.cfg a + FileSeek $0 0 END + FileWrite $0 "mod_openexr" + FileWriteByte $0 "13" + FileWriteByte $0 "10" + FileClose $0 + +SectionEnd + diff --git a/synfig-core/trunk/src/modules/mod_openexr/unmod_openexr.nsh b/synfig-core/trunk/src/modules/mod_openexr/unmod_openexr.nsh new file mode 100644 index 0000000..5592257 --- /dev/null +++ b/synfig-core/trunk/src/modules/mod_openexr/unmod_openexr.nsh @@ -0,0 +1,5 @@ +Section "un.mod_openexr" + Delete "$INSTDIR\lib\sinfg\modules\mod_openexr.dll" + RMDir "$INSTDIR" +SectionEnd + diff --git a/synfig-core/trunk/src/modules/mod_particle/mod_particle.nsh b/synfig-core/trunk/src/modules/mod_particle/mod_particle.nsh new file mode 100644 index 0000000..d7d1b8a --- /dev/null +++ b/synfig-core/trunk/src/modules/mod_particle/mod_particle.nsh @@ -0,0 +1,21 @@ +; The stuff to install +Section "mod_particle" Sec_mod_particle + +; SectionIn RO + + ; Set output path to the installation directory. + SetOutPath "$INSTDIR\lib\sinfg\modules" + + ; Put file there + File /oname=mod_particle.dll "src\modules\mod_particle\.libs\libmod_particle-0.dll" + + + FileOpen $0 $INSTDIR\etc\synfig_modules.cfg a + FileSeek $0 0 END + FileWrite $0 "mod_particle" + FileWriteByte $0 "13" + FileWriteByte $0 "10" + FileClose $0 + +SectionEnd + diff --git a/synfig-core/trunk/src/modules/mod_particle/unmod_particle.nsh b/synfig-core/trunk/src/modules/mod_particle/unmod_particle.nsh new file mode 100644 index 0000000..b9a9cc1 --- /dev/null +++ b/synfig-core/trunk/src/modules/mod_particle/unmod_particle.nsh @@ -0,0 +1,5 @@ +Section "un.mod_particle" + Delete "$INSTDIR\lib\sinfg\modules\mod_particle.dll" + RMDir "$INSTDIR" +SectionEnd + diff --git a/synfig-core/trunk/src/modules/mod_png/mod_png.nsh b/synfig-core/trunk/src/modules/mod_png/mod_png.nsh new file mode 100644 index 0000000..7c5c5de --- /dev/null +++ b/synfig-core/trunk/src/modules/mod_png/mod_png.nsh @@ -0,0 +1,21 @@ +; The stuff to install +Section "mod_png" Sec_mod_png + +; SectionIn RO + + ; Set output path to the installation directory. + SetOutPath "$INSTDIR\lib\sinfg\modules" + + ; Put file there + File /oname=mod_png.dll "src\modules\mod_png\.libs\libmod_png-0.dll" + + + FileOpen $0 $INSTDIR\etc\synfig_modules.cfg a + FileSeek $0 0 END + FileWrite $0 "mod_png" + FileWriteByte $0 "13" + FileWriteByte $0 "10" + FileClose $0 + +SectionEnd + diff --git a/synfig-core/trunk/src/modules/mod_png/unmod_png.nsh b/synfig-core/trunk/src/modules/mod_png/unmod_png.nsh new file mode 100644 index 0000000..f034c79 --- /dev/null +++ b/synfig-core/trunk/src/modules/mod_png/unmod_png.nsh @@ -0,0 +1,5 @@ +Section "un.mod_png" + Delete "$INSTDIR\lib\sinfg\modules\mod_png.dll" + RMDir "$INSTDIR" +SectionEnd + diff --git a/synfig-core/trunk/src/modules/mod_ppm/mod_ppm.nsh b/synfig-core/trunk/src/modules/mod_ppm/mod_ppm.nsh new file mode 100644 index 0000000..5447afc --- /dev/null +++ b/synfig-core/trunk/src/modules/mod_ppm/mod_ppm.nsh @@ -0,0 +1,21 @@ +; The stuff to install +Section "mod_ppm" Sec_mod_ppm + +; SectionIn RO + + ; Set output path to the installation directory. + SetOutPath "$INSTDIR\lib\sinfg\modules" + + ; Put file there + File /oname=mod_ppm.dll "src\modules\mod_ppm\.libs\libmod_ppm-0.dll" + + + FileOpen $0 $INSTDIR\etc\synfig_modules.cfg a + FileSeek $0 0 END + FileWrite $0 "mod_ppm" + FileWriteByte $0 "13" + FileWriteByte $0 "10" + FileClose $0 + +SectionEnd + diff --git a/synfig-core/trunk/src/modules/mod_ppm/unmod_ppm.nsh b/synfig-core/trunk/src/modules/mod_ppm/unmod_ppm.nsh new file mode 100644 index 0000000..30bab80 --- /dev/null +++ b/synfig-core/trunk/src/modules/mod_ppm/unmod_ppm.nsh @@ -0,0 +1,5 @@ +Section "un.mod_ppm" + Delete "$INSTDIR\lib\sinfg\modules\mod_ppm.dll" + RMDir "$INSTDIR" +SectionEnd + diff --git a/synfig-core/trunk/src/modules/mod_yuv420p/mod_yuv420p.nsh b/synfig-core/trunk/src/modules/mod_yuv420p/mod_yuv420p.nsh new file mode 100644 index 0000000..8b2cf35 --- /dev/null +++ b/synfig-core/trunk/src/modules/mod_yuv420p/mod_yuv420p.nsh @@ -0,0 +1,21 @@ +; The stuff to install +Section "mod_yuv420p" Sec_mod_yuv420p + +; SectionIn RO + + ; Set output path to the installation directory. + SetOutPath "$INSTDIR\lib\sinfg\modules" + + ; Put file there + File /oname=mod_yuv420p.dll "src\modules\mod_yuv420p\.libs\libmod_yuv420p-0.dll" + + + FileOpen $0 $INSTDIR\etc\synfig_modules.cfg a + FileSeek $0 0 END + FileWrite $0 "mod_yuv420p" + FileWriteByte $0 "13" + FileWriteByte $0 "10" + FileClose $0 + +SectionEnd + diff --git a/synfig-core/trunk/src/modules/mod_yuv420p/unmod_yuv420p.nsh b/synfig-core/trunk/src/modules/mod_yuv420p/unmod_yuv420p.nsh new file mode 100644 index 0000000..835364b --- /dev/null +++ b/synfig-core/trunk/src/modules/mod_yuv420p/unmod_yuv420p.nsh @@ -0,0 +1,5 @@ +Section "un.mod_yuv420p" + Delete "$INSTDIR\lib\sinfg\modules\mod_yuv420p.dll" + RMDir "$INSTDIR" +SectionEnd + diff --git a/synfig-core/trunk/src/modules/template.nsh b/synfig-core/trunk/src/modules/template.nsh new file mode 100644 index 0000000..53b5919 --- /dev/null +++ b/synfig-core/trunk/src/modules/template.nsh @@ -0,0 +1,21 @@ +; The stuff to install +Section "@MODNAME@" Sec_@MODNAME@ + +; SectionIn RO + + ; Set output path to the installation directory. + SetOutPath "$INSTDIR\lib\sinfg\modules" + + ; Put file there + File /oname=@MODNAME@.dll "src\modules\@MODNAME@\.libs\lib@MODNAME@-0.dll" + + + FileOpen $0 $INSTDIR\etc\synfig_modules.cfg a + FileSeek $0 0 END + FileWrite $0 "@MODNAME@" + FileWriteByte $0 "13" + FileWriteByte $0 "10" + FileClose $0 + +SectionEnd + diff --git a/synfig-core/trunk/src/modules/untemplate.nsh b/synfig-core/trunk/src/modules/untemplate.nsh new file mode 100644 index 0000000..4641bed --- /dev/null +++ b/synfig-core/trunk/src/modules/untemplate.nsh @@ -0,0 +1,5 @@ +Section "un.@MODNAME@" + Delete "$INSTDIR\lib\sinfg\modules\@MODNAME@.dll" + RMDir "$INSTDIR" +SectionEnd + diff --git a/synfig-core/trunk/src/synfig/synfig.nsh b/synfig-core/trunk/src/synfig/synfig.nsh index 46c591a..329d608 100644 --- a/synfig-core/trunk/src/synfig/synfig.nsh +++ b/synfig-core/trunk/src/synfig/synfig.nsh @@ -1,19 +1,19 @@ -; The stuff to install -Section "Synfig Core" - - SectionIn RO - - ; Set output path to the installation directory. - SetOutPath "$INSTDIR\bin" - - ; Put file there - File "src\synfig\.libs\libsynfig-0.dll" - -SectionEnd - -Section "un.Synfig Core" - Delete "$INSTDIR\bin\libsynfig-0.dll" - RMDir "$INSTDIR" -SectionEnd - - +; The stuff to install +Section "Synfig Core" + + SectionIn RO + + ; Set output path to the installation directory. + SetOutPath "$INSTDIR\bin" + + ; Put file there + File "src\synfig\.libs\libsynfig-0.dll" + +SectionEnd + +Section "un.Synfig Core" + Delete "$INSTDIR\bin\libsynfig-0.dll" + RMDir "$INSTDIR" +SectionEnd + + diff --git a/synfig-core/trunk/src/tool/tool.nsh b/synfig-core/trunk/src/tool/tool.nsh index 8befd6f..472788e 100644 --- a/synfig-core/trunk/src/tool/tool.nsh +++ b/synfig-core/trunk/src/tool/tool.nsh @@ -1,19 +1,19 @@ -; The stuff to install -Section "Synfig Tool" - -; SectionIn RO - - ; Set output path to the installation directory. - SetOutPath "$INSTDIR\bin" - - ; Put file there - File "src\tool\.libs\synfig.exe" - -SectionEnd - -Section "un.Synfig Tool Uninstall" - Delete "$INSTDIR\bin\synfig.exe" - RMDir "$INSTDIR" -SectionEnd - - +; The stuff to install +Section "Synfig Tool" + +; SectionIn RO + + ; Set output path to the installation directory. + SetOutPath "$INSTDIR\bin" + + ; Put file there + File "src\tool\.libs\synfig.exe" + +SectionEnd + +Section "un.Synfig Tool Uninstall" + Delete "$INSTDIR\bin\synfig.exe" + RMDir "$INSTDIR" +SectionEnd + + diff --git a/synfig-core/trunk/synfig.pc.in b/synfig-core/trunk/synfig.pc.in index f17204d..4da1149 100644 --- a/synfig-core/trunk/synfig.pc.in +++ b/synfig-core/trunk/synfig.pc.in @@ -6,6 +6,6 @@ includedir=@synfigincludedir@ Name: synfig Description: Synfig Core Requires: @CONFIG_DEPS@ -Version: 0.61.00-20 +Version: 0.61.00-27 Libs: -L${libdir} @CONFIG_LIBS@ Cflags: @CONFIG_CFLAGS@ -I@synfigincludedir@ diff --git a/synfig-core/trunk/win32build.sh b/synfig-core/trunk/win32build.sh index 924f6b3..a6d6a85 100755 --- a/synfig-core/trunk/win32build.sh +++ b/synfig-core/trunk/win32build.sh @@ -2,7 +2,10 @@ #OPTIONS="--disable-optimization --enable-debug" -OPTIONS="--enable-optimization=1 --disable-debug --enable-timelimit=120" +OPTIONS="--enable-optimization=1 --disable-debug" +OPTIONS="$OPTIONS --enable-timelimit=120" + +[ -e configure ] || ./bootstrap || exit 0 [ -d win32build ] && rm -fr win32build @@ -10,8 +13,8 @@ mkdir win32build cd win32build -../configure --host=mingw32 --prefix=C:/PROGRA~1/Synfig $OPTIONS +../configure --host=mingw32 --prefix=C:/PROGRA~1/Synfig $OPTIONS || exit 0 -make installer +make package diff --git a/synfig-core/trunk/win32inst.nsi.in b/synfig-core/trunk/win32inst.nsi.in index 8c6ba3b..0a2b56d 100644 --- a/synfig-core/trunk/win32inst.nsi.in +++ b/synfig-core/trunk/win32inst.nsi.in @@ -12,7 +12,7 @@ ; The name of the installer Name "@PACKAGE_NAME@ @PACKAGE_VERSION@" -!define PRODUCT_WEB_SITE "http://deepdarc.dnsalias.net/~darco/" +!define PRODUCT_WEB_SITE "http://voria.com/synfig/" ; The file to write OutFile "@PACKAGE_TARNAME@-@PACKAGE_VERSION@.exe" -- 2.7.4