Archived

This forum has been archived. Please start a new discussion on GitHub.

Patch #1 for Ice 3.3.0: fix for slice2cpp/slice2freeze

benoit
benoit Rennes, France
in Patches
Hi,

The attached patch fixes a problem with absolute paths in generated code #include directives. This bug only affects Unix platforms and #include <> directives for Slice files included from the same directory (with the -I. command line option specified).

To fix this problem you can use -I./ instead of -I. in the command line options as a workaround or apply the patch attached below.

To apply the patch: 
$ cd Ice-3.3.0
$ patch -p1 < patch.txt

Cheers,
Benoit.

Comments

  • cxq2003
    cxq2003
    under windows xp sp2, patch error shown below:

    D:\Ice-3.3.0-VC71\Ice-3.3.0>patch -p1 < patch.txt
    patching file cpp/src/Slice/Util.cpp
    Assertion failed: hunk, file ../patch-2.5.9-src/patch.c, line 354

    This application has requested the Runtime to terminate it in an unusual way.
    Please contact the application's support team for more information.
  • cxq2003
    cxq2003
    I use the gnu patch 2.5.9 for windows! I found the format of patchfile diff from the gnu diff format!

    Could you please tell me the diff tool the ice used? The gnu diff?

    use like this
    diff ..\origin\makefile ..\currnet\makefile > patch.txt
    or
    diff -c ..\origin\makefile ..\currnet\makefile > patch.txt


    or the patchfile must be patched under unix?

    The command shown below also result in the same error!

    patch -c -p1 < patch.txt
  • mes
    mes California
    Hi,

    Does it work if you use the --binary option when running patch?

    Mark
  • cxq2003
    cxq2003
    It works.

    Thanks a lot!

Categories