Fossil: Artifact [fdbc342369]

Artifact fdbc34236906e1aed95bdd1e62b6506a1b47aab8:

Ticket change [fdbc342369] - Ticket [786d01dc53] Fix some build issues on Windows status still Open with 2 other changes by anonymous 2010-04-05 20:07:16.
D 2010-04-05T20:07:16
J +comment \n\n<hr><i>anonymous\sclaiming\sto\sbe\stsbg\sadded\son\s2010-04-05\s20:07:16:</i><br>\nI\sdidn't\sfind\sa\spossibility\sto\sattach\sthe\spatch.\sNow\sit\sfollows\safter\shere:\r\n\r\n<verbatim>\r\ndiff\s-Naur\s-x\s_FOSSIL_\s-x\sbuild\sfossil-org/Makefile.w32\sfossil-src/Makefile.w32\r\n---\sfossil-org/Makefile.w32\t2010-04-04\s15:15:42\s+0000\r\n+++\sfossil-src/Makefile.w32\t2010-04-05\s10:19:38\s+0000\r\n@@\s-19,9\s+19,13\s@@\r\n\s#\r\n\sE\s=\s.exe\r\n\s\r\n-####\sEnable\sHTTPS\ssupport\svia\sOpenSSL\s(links\sto\slibssl\sand\slibcrypto)\r\n+####\sMake\sa\sbinary\swith\sall\slibraries\sstatically\slinked.\r\n\s#\r\n-#\sFOSSIL_ENABLE_SSL=1\r\n+#\sFOSSIL_BUILD_STATIC\s=\s1\r\n+\r\n+####\sEnable\sHTTPS\ssupport\svia\sOpenSSL.\r\n+#\r\n+#\sFOSSIL_ENABLE_SSL\s=\s1\r\n\s\r\n\s####\sC\sCompile\sand\soptions\sfor\suse\sin\sbuilding\sexecutables\sthat\s\r\n\s#\s\s\s\swill\srun\son\sthe\starget\splatform.\s\sThis\sis\susually\sthe\ssame\r\n@@\s-41,18\s+45,25\s@@\r\n\sendif\r\n\s\r\n\s####\sExtra\sarguments\sfor\slinking\sthe\sfinished\sbinary.\s\sFossil\sneeds\r\n-#\s\s\s\sto\slink\sagainst\sthe\sZ-Lib\scompression\slibrary.\s\sThere\sare\sno\r\n-#\s\s\s\sother\sdependencies.\s\sWe\ssometimes\sadd\sthe\s-static\soption\shere\r\n-#\s\s\s\sso\sthat\swe\scan\sbuild\sa\sstatic\sexecutable\sthat\swill\srun\sin\sa\r\n-#\s\s\s\schroot\sjail.\r\n-#\r\n-#LIB\s=\s-lz\r\n-#LIB\s=\s-lz\s-lws2_32\r\n-LIB\s=\s-lmingwex\s-lz\s-lws2_32\r\n+#\s\s\s\sto\slink\sagainst\sthe\sZ-Lib\scompression\slibrary\sand\sto\sthe\sOpenSSL\scrypto\r\n+#\s\s\s\slibraries\swhen\sFOSSIL_ENABLE_SSL\sis\sdefined.\sThere\sare\sno\sother\r\n+#\s\s\s\sdependencies.\r\n+#\r\n+ifdef\sFOSSIL_BUILD_STATIC\r\n+\s\sLIB\s+=\s-static\r\n+\s\sSSLLIBS\s=\s-lssl\s-lcrypto\s-lgdi32\r\n+else\r\n+#\sSSLLIBS\s=\s-lssl32\s-leay32\s\s#\sOpenSSL\sVersions\s<\s\s1.0.0\r\n+\s\sSSLLIBS\s=\s-lssl\s-lcrypto\s\s\s#\sOpenSSL\sVersions\s>=\s1.0.0\r\n+endif\r\n+#\r\n\s#\sOpenSSL:\r\n\sifdef\sFOSSIL_ENABLE_SSL\r\n-LIB\s+=\s-lcrypto\s-lssl\r\n+\s\sLIB\s+=\s$(SSLLIBS)\r\n\sendif\r\n+#\r\n+#\sNormal\srequired\slibraries:\r\n+LIB\s+=\s-lmingwex\s-lz\s-lws2_32\r\n\s\r\n\s####\sTcl\sshell\sfor\suse\sin\srunning\sthe\sfossil\stestsuite.\r\n\s#\r\ndiff\s-Naur\s-x\s_FOSSIL_\s-x\sbuild\sfossil-org/src/makemake.tcl\sfossil-src/src/makemake.tcl\r\n---\sfossil-org/src/makemake.tcl\t2010-04-04\s15:18:11\s+0000\r\n+++\sfossil-src/src/makemake.tcl\t2010-04-05\s10:42:39\s+0000\r\n@@\s-114,7\s+114,10\s@@\r\n\s\s\sputs\s-nonewline\s"\s\\\\\\n\s\\$(OBJDIR)/$s.o"\r\n\s}\r\n\sputs\s"\\n"\r\n-puts\s"APPNAME\s=\s$name\\$(E)"\r\n+puts\s"APPNAME\s\s\s\s\s=\s$name\\$(E)"\r\n+puts\s"TRANSLATE\s\s\s=\stranslate\\$(E)"\r\n+puts\s"MAKEHEADERS\s=\smakeheaders\\$(E)"\r\n+puts\s"MKINDEX\s\s\s\s\s=\smkindex\\$(E)"\r\n\sputs\s"\\n"\r\n\s\r\n\sputs\s{\r\n@@\s-126,13\s+129,13\s@@\r\n\s$(OBJDIR):\r\n\s\t-mkdir\s$(OBJDIR)\r\n\s\r\n-translate:\t$(SRCDIR)/translate.c\r\n+$(TRANSLATE):\t$(SRCDIR)/translate.c\r\n\s\t$(BCC)\s-o\stranslate\s$(SRCDIR)/translate.c\r\n\s\r\n-makeheaders:\t$(SRCDIR)/makeheaders.c\r\n+$(MAKEHEADERS):\t$(SRCDIR)/makeheaders.c\r\n\s\t$(BCC)\s-o\smakeheaders\s$(SRCDIR)/makeheaders.c\r\n\s\r\n-mkindex:\t$(SRCDIR)/mkindex.c\r\n+$(MKINDEX):\t$(SRCDIR)/mkindex.c\r\n\s\t$(BCC)\s-o\smkindex\s$(SRCDIR)/mkindex.c\r\n\s\r\n\s#\sWARNING.\sDANGER.\sRunning\sthe\stestsuite\smodifies\sthe\srepository\sthe\r\n@@\s-161,7\s+164,7\s@@\r\n\s\r\n\sclean:\t\r\n\s\trm\s-f\s$(OBJDIR)/*.o\s*_.c\s$(APPNAME)\sVERSION.h\r\n-\trm\s-f\stranslate\smakeheaders\smkindex\spage_index.h\sheaders}\r\n+\trm\s-f\s$(TRANSLATE)\s$(MAKEHEADERS)\s$(MKINDEX)\spage_index.h\sheaders}\r\n\s\r\n\sset\shfiles\s{}\r\n\sforeach\ss\s[lsort\s$src]\s{lappend\shfiles\s$s.h}\r\n@@\s-175,23\s+178,23\s@@\r\n\sappend\smhargs\s"\s\\$(SRCDIR)/sqlite3.h"\r\n\sappend\smhargs\s"\s\\$(SRCDIR)/th.h"\r\n\sappend\smhargs\s"\sVERSION.h"\r\n-puts\s"page_index.h:\s\\$(TRANS_SRC)\smkindex"\r\n-puts\s"\\t./mkindex\s\\$(TRANS_SRC)\s>$@"\r\n-puts\s"headers:\\tpage_index.h\smakeheaders\sVERSION.h"\r\n-puts\s"\\t./makeheaders\s$mhargs"\r\n+puts\s"page_index.h:\s\\$(TRANS_SRC)\s\\$(MKINDEX)"\r\n+puts\s"\\t./\\$(MKINDEX)\s\\$(TRANS_SRC)\s>$@"\r\n+puts\s"headers:\\tpage_index.h\s\\$(MAKEHEADERS)\sVERSION.h"\r\n+puts\s"\\t./\\$(MAKEHEADERS)\s$mhargs"\r\n\sputs\s"\\ttouch\sheaders"\r\n\sputs\s"headers:\sMakefile"\r\n\sputs\s"Makefile:"\r\n\sset\sextra_h(main)\spage_index.h\r\n\s\r\n\sforeach\ss\s[lsort\s$src]\s{\r\n-\s\sputs\s"${s}_.c:\\t\\$(SRCDIR)/$s.c\stranslate"\r\n-\s\sputs\s"\\t./translate\s\\$(SRCDIR)/$s.c\s>${s}_.c\\n"\r\n+\s\sputs\s"${s}_.c:\\t\\$(SRCDIR)/$s.c\s\\$(TRANSLATE)"\r\n+\s\sputs\s"\\t./\\$(TRANSLATE)\s\\$(SRCDIR)/$s.c\s>${s}_.c"\r\n\s\s\sputs\s"\\$(OBJDIR)/$s.o:\\t${s}_.c\s$s.h\s$extra_h($s)\s\\$(SRCDIR)/config.h"\r\n-\s\sputs\s"\\t\\$(XTCC)\s-o\s\\$(OBJDIR)/$s.o\s-c\s${s}_.c\\n"\r\n-\s\sputs\s"$s.h:\\theaders"\r\n-#\s\sputs\s"\\t./makeheaders\s$mhargs\\n\\ttouch\sheaders\\n"\r\n-#\s\sputs\s"\\t./makeheaders\s${s}_.c:${s}.h\\n"\r\n+\s\sputs\s"\\t\\$(XTCC)\s-o\s\\$(OBJDIR)/$s.o\s-c\s${s}_.c"\r\n+\s\sputs\s"$s.h:\\theaders\\n"\r\n+#\s\sputs\s"\\t./$(MAKEHEADERS)\s$mhargs\\n\\ttouch\sheaders\\n"\r\n+#\s\sputs\s"\\t./$(MAKEHEADERS)\s${s}_.c:${s}.h\\n"\r\n\s}\r\n</verbatim>
J resolution Open
K 786d01dc532813d0a635ec7c203f8503c2383609
U anonymous
Z 56ed61235e47a94d96eb659ecd3c7b58