Ticket #185: chicken-4.4.0-manifests.patch

File chicken-4.4.0-manifests.patch, 5.8 KB (added by felix winkelmann, 16 years ago)

  • chicken-install.rc 

    diff -rNu chicken-4.4.0.old/chicken-install.rc chicken-4.4.0.new/chicken-install.rc
    old new  
     11 24 MOVEABLE PURE
     2BEGIN
     3  "<?xml version=""1.0"" encoding=""UTF-8"" standalone=""yes""?>\r\n"
     4  "<assembly xmlns=""urn:schemas-microsoft-com:asm.v1"" manifestVersion=""1.0"">\r\n"
     5  "  <assemblyIdentity version=""1.0.0.0"" processorArchitecture=""*"" name=""chicken-install"" type=""win32""/>\r\n"
     6  "  <ms_asmv2:trustInfo xmlns:ms_asmv2=""urn:schemas-microsoft-com:asm.v2"">\r\n"
     7  "    <ms_asmv2:security>\r\n"
     8  "      <ms_asmv2:requestedPrivileges>\r\n"
     9  "        <ms_asmv2:requestedExecutionLevel level=""asInvoker"" uiAccess=""false""/>\r\n"
     10  "      </ms_asmv2:requestedPrivileges>\r\n"
     11  "    </ms_asmv2:security>\r\n"
     12  "  </ms_asmv2:trustInfo>\r\n"
     13  "</assembly>\r\n"
     14END

  • chicken-uninstall.rc 

    diff -rNu chicken-4.4.0.old/chicken-uninstall.rc chicken-4.4.0.new/chicken-uninstall.rc
    old new  
     11 24 MOVEABLE PURE
     2BEGIN
     3  "<?xml version=""1.0"" encoding=""UTF-8"" standalone=""yes""?>\r\n"
     4  "<assembly xmlns=""urn:schemas-microsoft-com:asm.v1"" manifestVersion=""1.0"">\r\n"
     5  "  <assemblyIdentity version=""1.0.0.0"" processorArchitecture=""*"" name=""chicken-uninstall"" type=""win32""/>\r\n"
     6  "  <ms_asmv2:trustInfo xmlns:ms_asmv2=""urn:schemas-microsoft-com:asm.v2"">\r\n"
     7  "    <ms_asmv2:security>\r\n"
     8  "      <ms_asmv2:requestedPrivileges>\r\n"
     9  "        <ms_asmv2:requestedExecutionLevel level=""asInvoker"" uiAccess=""false""/>\r\n"
     10  "      </ms_asmv2:requestedPrivileges>\r\n"
     11  "    </ms_asmv2:security>\r\n"
     12  "  </ms_asmv2:trustInfo>\r\n"
     13  "</assembly>\r\n"
     14END

  • chicken-4.4.0. 

    diff -rNu chicken-4.4.0.old/config.make chicken-4.4.0.new/config.make
    old new  
    2929# Add additional C compiler options:
    3030#C_COMPILER_OPTIMIZATION_OPTIONS=...
    3131
     32# Use alternative resource compiler (for Win32 builds)
     33#RC_COMPILER=
     34
    3235# Choose prefix to be added to installed programs:
    3336#PROGRAM_PREFIX=
    3437

  • defaults.make 

    diff -rNu chicken-4.4.0.old/defaults.make chicken-4.4.0.new/defaults.make
    old new  
    9696CXX_COMPILER ?= g++
    9797LIBRARIAN ?= ar
    9898endif
     99ifdef WINDOWS
     100ifdef HOSTSYSTEM
     101RC_COMPILER ?= $(HOSTSYSTEM)-windres
     102else
     103RC_COMPILER ?= windres
     104endif
     105endif
    99106LINKER ?= $(C_COMPILER)
    100107ifdef WINDOWS_SHELL
    101108REMOVE_COMMAND ?= del

  • Makefile.cygwin 

    diff -rNu chicken-4.4.0.old/Makefile.cygwin chicken-4.4.0.new/Makefile.cygwin
    old new  
    4444
    4545C_COMPILER = gcc
    4646CXX_COMPILER = g++
     47RC_COMPILER = windres
    4748LINKER = gcc
    4849
    4950

  • Makefile.mingw 

    diff -rNu chicken-4.4.0.old/Makefile.mingw chicken-4.4.0.new/Makefile.mingw
    old new  
    6666endif
    6767endif
    6868C_COMPILER_SHARED_OPTIONS = -DPIC
     69RC_COMPILER ?= windres
    6970LINKER_LINK_SHARED_LIBRARY_OPTIONS = -shared
    7071LIBRARIES = -lm -lws2_32
    7172LINKER_OPTIONS = -Wl,--enable-auto-import

  • chicken-4.4.0. 

    diff -rNu chicken-4.4.0.old/rules.make chicken-4.4.0.new/rules.make
    old new  
    668668          $(C_COMPILER_STATIC_OPTIONS) \
    669669          $(C_COMPILER_COMPILE_OPTION) $(C_COMPILER_OPTIMIZATION_OPTIONS) $< $(C_COMPILER_OUTPUT)
    670670
     671# resource objects
     672
     673chicken-install.rc$(O): chicken-install.rc
     674        $(RC_COMPILER) $< $@
     675chicken-uninstall.rc$(O): chicken-uninstall.rc
     676        $(RC_COMPILER) $< $@
     677
    671678# libraries
    672679
    673680.PHONY: libs
    … …  
    734741        $(LINKER) $(LINKER_OPTIONS) $(LINKER_EXECUTABLE_OPTIONS) $< $(LINKER_OUTPUT) \
    735742          $(LINKER_LIBRARY_PREFIX)chicken$(LINKER_LIBRARY_SUFFIX) $(LINKER_LINK_SHARED_PROGRAM_OPTIONS) $(LIBRARIES)
    736743
     744ifneq ($(RC_COMPILER),)
     745$(CHICKEN_INSTALL_PROGRAM)$(EXE): chicken-install$(O) chicken-install.rc$(O) $(PRIMARY_LIBCHICKEN)
     746        $(LINKER) $(LINKER_OPTIONS) $(LINKER_EXECUTABLE_OPTIONS) $< chicken-install.rc$(O) $(LINKER_OUTPUT) \
     747          $(LINKER_LIBRARY_PREFIX)chicken$(LINKER_LIBRARY_SUFFIX) $(LINKER_LINK_SHARED_PROGRAM_OPTIONS) $(LIBRARIES)
     748else
    737749$(CHICKEN_INSTALL_PROGRAM)$(EXE): chicken-install$(O) $(PRIMARY_LIBCHICKEN)
    738750        $(LINKER) $(LINKER_OPTIONS) $(LINKER_EXECUTABLE_OPTIONS) $< $(LINKER_OUTPUT) \
    739751          $(LINKER_LIBRARY_PREFIX)chicken$(LINKER_LIBRARY_SUFFIX) $(LINKER_LINK_SHARED_PROGRAM_OPTIONS) $(LIBRARIES)
     752endif
     753ifneq ($(RC_COMPILER),)
     754$(CHICKEN_UNINSTALL_PROGRAM)$(EXE): chicken-uninstall$(O) chicken-uninstall.rc$(O) $(PRIMARY_LIBCHICKEN)
     755        $(LINKER) $(LINKER_OPTIONS) $(LINKER_EXECUTABLE_OPTIONS) $< chicken-uninstall.rc$(O) $(LINKER_OUTPUT) \
     756          $(LINKER_LIBRARY_PREFIX)chicken$(LINKER_LIBRARY_SUFFIX) $(LINKER_LINK_SHARED_PROGRAM_OPTIONS) $(LIBRARIES)
     757else
    740758$(CHICKEN_UNINSTALL_PROGRAM)$(EXE): chicken-uninstall$(O) $(PRIMARY_LIBCHICKEN)
    741759        $(LINKER) $(LINKER_OPTIONS) $(LINKER_EXECUTABLE_OPTIONS) $< $(LINKER_OUTPUT) \
    742760          $(LINKER_LIBRARY_PREFIX)chicken$(LINKER_LIBRARY_SUFFIX) $(LINKER_LINK_SHARED_PROGRAM_OPTIONS) $(LIBRARIES)
     761endif
    743762$(CHICKEN_STATUS_PROGRAM)$(EXE): chicken-status$(O) $(PRIMARY_LIBCHICKEN)
    744763        $(LINKER) $(LINKER_OPTIONS) $(LINKER_EXECUTABLE_OPTIONS) $< $(LINKER_OUTPUT) \
    745764          $(LINKER_LIBRARY_PREFIX)chicken$(LINKER_LIBRARY_SUFFIX) $(LINKER_LINK_SHARED_PROGRAM_OPTIONS) $(LIBRARIES)