Menu

#105 base/win/makefile.vc: it is PRJ_PACKAGE_TCLNAME, not PRJ_PACKAGE_NAME

1.2.4
closed
None
1
2021-03-06
2021-03-05
No

Hi Paul,
thank you for great image patch.

I was surprised: building with MS-VC6 and makefile.vc works !!!

I only found some small typos:

File:
base/win/makefile.vc

Replace "PRJ_PACKAGE_NAME" by "PRJ_PACKAGE_TCLNAME"

File:
win/rules-img.vc
-- Patch --

--- C:/test/img_package/Img-1.4.13_ori/win/rules-img.vc Tue Jul  7 19:04:53 2020
+++ C:/test/img_package/Img-1.4.13/win/rules-img.vc Fri Mar  5 19:06:05 2021
@@ -9,7 +9,7 @@
 PROJECT = tkimg$(PHIMGTYPE)
 !endif

-!ifndef PACKAGE_TCLNAME
+!ifndef PRJ_PACKAGE_TCLNAME
 PRJ_PACKAGE_TCLNAME = img::$(PHIMGTYPE)
 !endif

@@ -87,7 +87,7 @@
 $(TMP_DIR)\init.c:
    nmakehlp -s << ..\..\init.c > $(TMP_DIR)\init.c
 @CPACKAGE@       $(CPACKAGE)
-%PACKAGE%        $(PACKAGE_NAME)
+%PACKAGE%        $(PRJ_PACKAGE_TCLNAME)
 %PHIMGTYPE%      $(PHIMGTYPE)
 %PHIMGTYPE_BETA% $(PHIMGTYPE_BETA)
 <<

--END--

I only tested bmp and base modules.

I suppose, I even have cvs access from the old days when I added -resolution to bmp write.
But no cvs on my system. It would be great, if you could do the changes.

Thank you,
Harald

Discussion

  • Harald Oehlmann

    Harald Oehlmann - 2021-03-05

    I now did a full compilation from the win folder: anything works well !

    Well, I had to remove the "[string totitle img::bmp]" in the pkgIndex.tcl from:

    package ifneeded img::bmp 1.4.13 [list load [file join $dir tkimgbmp1413t.dll] [string totitle img::bmp]]
    

    Otherwise, I get the error:

     % package require img::bmp
    cannot find symbol "Img::bmp_Init"
    

    So, the pkgIndex.tcl line, which works for bmp is:

    package ifneeded img::bmp 1.4.13 [list load [file join $dir tkimgbmp1413t.dll]]
    
     
  • Paul Obermeier

    Paul Obermeier - 2021-03-06
    • status: open --> closed
    • assigned_to: Paul Obermeier
     
  • Paul Obermeier

    Paul Obermeier - 2021-03-06

    Fixed with #538:

    Do not use the default-pkgindex target from Tcl, but include a copy here.
    This target has changed on 2020/12/09 (and was part of Tcl 8.6.11) to include a "string totitle", which breaks the naming convention of the Img package.
    The "string totitle" was rollbacked in 2021/01/04, so this workaround is practically only needed for Tcl 8.6.11.
    See https://core.tcl-lang.org/tcl/info/4dfa9000e1e2db8c

     

Log in to post a comment.

MongoDB Logo MongoDB