STABLE win32 build and install patch

From: Jordi Mas (jmas@softcatala.org)
Date: Sat Oct 25 2003 - 14:05:47 EDT

  • Next message: Kenneth J. Davis: "Re: STABLE win32 build and install patch"

    Hello,

    I have done a complete STABLE build including the new win32 native image
    plugin. You can download it from:

    http://www.softcatala.org/~jmas/setup_abiword.exe

    I also have hacked the install files to make NSIS and the Makefiles to build
    and install the new win32 native image plugin instead of the BMP one. I did
    the changes to be able to build all together in my configuration. I'm
    attaching the patch. If it is OK, please commit it to stable and head.

    Best Regards, 

    -- 

    Jordi Mas i Hernāndez (homepage http://www.softcatala.org/~jmas)
http://www.softcatala.org

    Index: src/pkg/win/setup/AbiWord.nsi
    ===================================================================
    RCS file: /cvsroot/abi/src/pkg/win/setup/AbiWord.nsi,v
    retrieving revision 1.24
    diff -c -r1.24 AbiWord.nsi
    *** src/pkg/win/setup/AbiWord.nsi 10 Sep 2003 14:31:22 -0000 1.24
    --- src/pkg/win/setup/AbiWord.nsi 25 Oct 2003 18:00:38 -0000
    ***************
    *** 60,69 ****
                      File "libAbiWord.dll"
              !endif
      
    ! ; We need BMP plugin for cut-n-paste of images on Windows
    ! !ifdef HAVEBMP
                      SetOutPath $INSTDIR\AbiWord\plugins
    ! File "..\plugins\libAbi_IEG_BMP.dll"
              !endif
      
              SetOutPath $INSTDIR\AbiWord
    --- 60,69 ----
                      File "libAbiWord.dll"
              !endif
      
    ! ; We need Win32Native plugin for cut-n-paste of images on Windows and graphic imports
    ! !ifdef HAVEWIN32NATIVE
                      SetOutPath $INSTDIR\AbiWord\plugins
    ! File "..\plugins\libAbi_IEG_Win32Native.dll"
              !endif
      
              SetOutPath $INSTDIR\AbiWord
    Index: src/pkg/win/setup/Makefile
    ===================================================================
    RCS file: /cvsroot/abi/src/pkg/win/setup/Makefile,v
    retrieving revision 1.27
    diff -c -r1.27 Makefile
    *** src/pkg/win/setup/Makefile 13 Sep 2003 00:38:25 -0000 1.27
    --- src/pkg/win/setup/Makefile 25 Oct 2003 18:00:38 -0000
    ***************
    *** 54,64 ****
      NSIS_OPT += //DMINGW32=1
      endif
      
    ! ifneq ($(wildcard $(ABI_ROOT)/../abiword-plugins/wp/impexp/graphics/bmp),)
      ifeq ($(OS_NAME),MINGW32)
    ! NSIS_OPT += //DHAVEBMP=1
      else
    ! NSIS_OPT += /DHAVEBMP=1
      endif
      endif
      
    --- 54,64 ----
      NSIS_OPT += //DMINGW32=1
      endif
      
    ! ifneq ($(wildcard $(ABI_ROOT)/../abiword-plugins/wp/impexp/graphics/win32native),)
      ifeq ($(OS_NAME),MINGW32)
    ! NSIS_OPT += //DHAVEWIN32NATIVE=1
      else
    ! NSIS_OPT += /DHAVEWIN32NATIVE=1
      endif
      endif
      
    ***************
    *** 79,91 ****
                      exit 1; \
              fi
      
    ! _BMP_PLUGIN_:
    ! @if [ -d $(ABI_ROOT)/../abiword-plugins/wp/impexp/graphics/bmp ]; then \
    ! echo Found BMP graphic file filter plugin; \
    ! echo Building for use with Windows cut and paste support; \
    ! $(MAKE) -f Makefile -C $(ABI_ROOT)/../abiword-plugins/wp/impexp/graphics/bmp; \
              else \
    ! echo BMP graphic file filter plugin NOT found; \
                      echo Please ignore the warning generated by NSIS about this file missing; \
                      echo However, cut and paste support may not work for images without this plugin!; \
              fi
    --- 79,91 ----
                      exit 1; \
              fi
      
    ! _WIN32NATIVE_PLUGIN_:
    ! @if [ -d $(ABI_ROOT)/../abiword-plugins/wp/impexp/graphics/win32native ]; then \
    ! echo Found win32native graphic file filter plugin; \
    ! echo Building for use with Windows cut and paste support and graphics import; \
    ! $(MAKE) -f Makefile -C $(ABI_ROOT)/../abiword-plugins/wp/impexp/graphics/win32native; \
              else \
    ! echo win32native graphic file filter plugin NOT found; \
                      echo Please ignore the warning generated by NSIS about this file missing; \
                      echo However, cut and paste support may not work for images without this plugin!; \
              fi
    ***************
    *** 99,105 ****
      
      else
      
    ! distribution:: _NSIS_ _BMP_PLUGIN_ $(TARGETS)
              @echo Copying $(PROGRAM) to $(DIST)
              @$(subst xxxx,$(DIST),$(VERIFY_DIRECTORY))
              @$(ABICOPY) $(PROGRAM) $(DIST)
    --- 99,105 ----
      
      else
      
    ! distribution:: _NSIS_ _WIN32NATIVE_PLUGIN_ $(TARGETS)
              @echo Copying $(PROGRAM) to $(DIST)
              @$(subst xxxx,$(DIST),$(VERIFY_DIRECTORY))
              @$(ABICOPY) $(PROGRAM) $(DIST)

    This archive was generated by hypermail 2.1.4 : Sat Oct 25 2003 - 14:08:30 EDT