Discussion:
Looking for guinea pig to test Makefile.msc changes
(too old to reply)
Stephan Beal
2013-01-24 14:30:02 UTC
Permalink
Hello, list,

Attached (assuming the list lets it through) is a replacement for
win/Makefile.msc, containing patches from Rudi and Tim for enabling JSON
support, which i would like to commit but would also like to see tested
before i commit it. i'm looking for someone with Windows who can try to
replace their existing Makefile.msc with this one and see if it still
builds.

Any volunteers?

JSON and Markdown are off by default but can be enabled by either:

Uncommenting these lines:
# Uncomment to enable JSON API
# FOSSIL_ENABLE_JSON = 1
# Uncomment to enable markdown support
# FOSSIL_ENABLE_MARKDOWN = 1

Or (theoretically) setting those macros on the command line (i have no idea
how that's done in nmake).

If someone can verify that i haven't broken the nmake file then i'll get
this committed.

Before trying it, please update to the latest trunk because this file also
takes advantage of a minor new change in cson_amalgamation.h.

:-?

PS: gmail tells me that "Makefile.msc is an executable file" and refuses to
send it for security reasons, so the file has been renamed with a .txt
extension. Please re-name it before trying.
--
----- stephan beal
http://wanderinghorse.net/home/stephan/
http://gplus.to/sgbeal
Jonas Malaco Filho
2013-01-24 14:59:55 UTC
Permalink
I'll test it later today!
Post by Stephan Beal
Hello, list,
Attached (assuming the list lets it through) is a replacement for
win/Makefile.msc, containing patches from Rudi and Tim for enabling JSON
support, which i would like to commit but would also like to see tested
before i commit it. i'm looking for someone with Windows who can try to
replace their existing Makefile.msc with this one and see if it still
builds.
Any volunteers?
# Uncomment to enable JSON API
# FOSSIL_ENABLE_JSON = 1
# Uncomment to enable markdown support
# FOSSIL_ENABLE_MARKDOWN = 1
Or (theoretically) setting those macros on the command line (i have no
idea how that's done in nmake).
If someone can verify that i haven't broken the nmake file then i'll get
this committed.
Before trying it, please update to the latest trunk because this file also
takes advantage of a minor new change in cson_amalgamation.h.
:-?
PS: gmail tells me that "Makefile.msc is an executable file" and refuses
to send it for security reasons, so the file has been renamed with a .txt
extension. Please re-name it before trying.
--
----- stephan beal
http://wanderinghorse.net/home/stephan/
http://gplus.to/sgbeal
--
*Jonas Malaco Filho*
Arjen Markus
2013-01-24 15:04:22 UTC
Permalink
Hi Stephan,

I just tried it:
- two syntax errors - !if FOSSIL_ENABLE_JSON should
be !ifdef FOSSIL_ENABLE_JSON
(likewise FOSSIL_ENABLE_MARKDOWN)

After correcting these, nmake runs fine. I do get two
warnings about locally imported symbols - malloc and free
somewhere in zlib. Annoying messages that I can never
really understand.

This is with MSVC/C++ version 16 (MicroSoft Visual Studio
2010), 32-bits mode. The fossil executable seems to be
working fine.

Regards,

Arjen

On Thu, 24 Jan 2013 15:30:02 +0100
Post by Stephan Beal
Hello, list,
Attached (assuming the list lets it through) is a
replacement for
win/Makefile.msc, containing patches from Rudi and Tim
for enabling JSON
support, which i would like to commit but would also
like to see tested
before i commit it. i'm looking for someone with Windows
who can try to
replace their existing Makefile.msc with this one and
see if it still
builds.
Any volunteers?
JSON and Markdown are off by default but can be enabled
# Uncomment to enable JSON API
# FOSSIL_ENABLE_JSON = 1
# Uncomment to enable markdown support
# FOSSIL_ENABLE_MARKDOWN = 1
Or (theoretically) setting those macros on the command
line (i have no idea
how that's done in nmake).
If someone can verify that i haven't broken the nmake
file then i'll get
this committed.
Before trying it, please update to the latest trunk
because this file also
takes advantage of a minor new change in
cson_amalgamation.h.
:-?
PS: gmail tells me that "Makefile.msc is an executable
file" and refuses to
send it for security reasons, so the file has been
renamed with a .txt
extension. Please re-name it before trying.
--
----- stephan beal
http://wanderinghorse.net/home/stephan/
http://gplus.to/sgbeal
DISCLAIMER: This message is intended exclusively for the addressee(s) and may contain confidential and privileged information. If you are not the intended recipient please notify the sender immediately and destroy this message. Unauthorized use, disclosure or copying of this message is strictly prohibited.
The foundation 'Stichting Deltares', which has its seat at Delft, The Netherlands, Commercial Registration Number 41146461, is not liable in any way whatsoever for consequences and/or damages resulting from the improper, incomplete and untimely dispatch, receipt and/or content of this e-mail.
Stephan Beal
2013-01-24 15:22:02 UTC
Permalink
(meanwhile, back on the mailing list...)
that is the sort of output I get - somewhat different
numbers of course, but the rest is the same.
Thank you!

i've just committed this change, so please try once again with the
(official) copy:

http://fossil-scm.org/index.html/info/bb63588e1b
--
----- stephan beal
http://wanderinghorse.net/home/stephan/
http://gplus.to/sgbeal
Konstantin Khomoutov
2013-01-24 15:58:35 UTC
Permalink
On Thu, 24 Jan 2013 16:22:02 +0100
Stephan Beal <***@googlemail.com> wrote:

[...]
Post by Stephan Beal
i've just committed this change, so please try once again with the
http://fossil-scm.org/index.html/info/bb63588e1b
Builds OK here using VC6 with the call

nmake -f Makefile.msc FOSSIL_ENABLE_JSON=1 FOSSIL_ENABLE_MARKDOWN=1

`fossil json whoami` works OK.
Not sure how to test the markdown functionality.
Stephan Beal
2013-01-24 16:07:43 UTC
Permalink
On Thu, Jan 24, 2013 at 4:58 PM, Konstantin Khomoutov <
Post by Konstantin Khomoutov
Builds OK here using VC6 with the call
nmake -f Makefile.msc FOSSIL_ENABLE_JSON=1 FOSSIL_ENABLE_MARKDOWN=1
`fossil json whoami` works OK.
Great! VC6? Surprise, surprise.
Post by Konstantin Khomoutov
Not sure how to test the markdown functionality.
Me, neither, but... the only markdown-related change is the
FOSSIL_ENABLE_MARKDOWN flag - there are no file-level changes for that, so
i expect no problems there.

Thanks for the help, guys!
--
----- stephan beal
http://wanderinghorse.net/home/stephan/
http://gplus.to/sgbeal
Jonas Malaco Filho
2013-01-25 07:53:52 UTC
Permalink
This works fine with MSVC 16 (as expected, since Arjen already tested it).


*Jonas Malaco Filho*
Post by Stephan Beal
(meanwhile, back on the mailing list...)
that is the sort of output I get - somewhat different
numbers of course, but the rest is the same.
Thank you!
i've just committed this change, so please try once again with the
http://fossil-scm.org/index.html/info/bb63588e1b
--
----- stephan beal
http://wanderinghorse.net/home/stephan/
http://gplus.to/sgbeal
_______________________________________________
fossil-users mailing list
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Александр Орефков
2013-01-25 08:21:44 UTC
Permalink
Hi.
I build fossil in other folder, not in "win", and change "B = " at
begin of file.
Error In line

fossil.res : ..\win\fossil.rc

need
fossil.res : $B\win\fossil.rc

WBR, Alexander Orefkov
Post by Jonas Malaco Filho
This works fine with MSVC 16 (as expected, since Arjen already tested it).
Jonas Malaco Filho
Post by Stephan Beal
(meanwhile, back on the mailing list...)
that is the sort of output I get - somewhat different
numbers of course, but the rest is the same.
Thank you!
i've just committed this change, so please try once again with the
http://fossil-scm.org/index.html/info/bb63588e1b
--
----- stephan beal
http://wanderinghorse.net/home/stephan/
http://gplus.to/sgbeal
_______________________________________________
fossil-users mailing list
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
_______________________________________________
fossil-users mailing list
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Stephan Beal
2013-01-25 08:54:41 UTC
Permalink
Post by Александр Орефков
need
fossil.res : $B\win\fossil.rc
Fixed, thanks!

http://fossil-scm.org/index.html/info/461a4d11d1
--
----- stephan beal
http://wanderinghorse.net/home/stephan/
http://gplus.to/sgbeal
Martin Gagnon
2013-01-25 21:45:18 UTC
Permalink
Post by Stephan Beal
Post by Александр Орефков
need
fossil.res : $B\win\fossil.rc
Fixed, thanks!
http://fossil-scm.org/index.html/info/461a4d11d1
I don't know about nmake syntax, but other reference to B in Makefile.msc
use brackets.
e.g: $(B) instead of just $B

I know that () are needed in GNU and BSD Makefiles, but I don't know about
nmake..

Regards
--
Martin G.
Stephan Beal
2013-01-25 21:54:14 UTC
Permalink
Post by Stephan Beal
I don't know about nmake syntax, but other reference to B in Makefile.msc
use brackets.
e.g: $(B) instead of just $B
Good point - i was copy/pasting from an MSC user ;).
Post by Stephan Beal
I know that () are needed in GNU and BSD Makefiles, but I don't know about
nmake..
Standard(ish) makes allow vars to be expanded without () or {} if they are
a single character:

http://pubs.opengroup.org/onlinepubs/009695399/utilities/make.html

No idea about nmake, but looking at Makefile.msc, i see $O and $B in other
places, so i'll leave it for now unless someone reports it broken.
--
----- stephan beal
http://wanderinghorse.net/home/stephan/
http://gplus.to/sgbeal
Ross Berteig
2013-01-25 22:24:27 UTC
Permalink
Works for me after parking my previous tweaks in a private branch and
updating to trunk. I did not exercise the $B question since I've been
following the path of least resistance and building in the win folder.
After opening a VS2010 32-bit command prompt and changing to the win
folder, nmake -f Makefile.msc FOSSIL_ENABLE_JSON=1 just worked. The
resulting fossil.exe runs, and fossil version reports:

"This is fossil version 1.25 [461a4d11d1] 2013-01-25 08:53:54 UTC"

The json support also works well enough that my ticket report writer
utility just works. (I still need to publish that, I will do that "real
soon now".)

I checked and the tweaks I had made to v1.24 to get json under windows
were mostly in Makefile.msc and no longer needed. The other substantive
tweak was a bug in blob.c only evident in a Windows compile that Richard
fixed last November in checkin [9073d8dcc7].

Now to go build with Markdown turned on, and play with the new toy...
Post by Stephan Beal
....
No idea about nmake, but looking at Makefile.msc, i see $O and $B in
other places, so i'll leave it for now unless someone reports it broken.
I'm reasonably certain that nmake does allow single-char variables to be
referenced without parenthesis.
--
Ross Berteig ***@CheshireEng.com
Cheshire Engineering Corp. http://www.CheshireEng.com/
+1 626 303 1602
+1 626 351 1590 FAX
Stephan Beal
2013-01-26 11:56:53 UTC
Permalink
Post by Ross Berteig
The json support also works well enough that my ticket report writer
utility just works. (I still need to publish that, I will do that "real
soon now".)
i'd be particularly interested in seeing what you've done there and in
getting your feedback on how to handle the ticket API via JSON.
--
----- stephan beal
http://wanderinghorse.net/home/stephan/
http://gplus.to/sgbeal
Loading...