Branch: Tag:

2004-11-16

2004-11-16 12:06:49 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Some cleanups.

Rev: server/bin/mk_wxs.pike:1.6

1:   /* -  * $Id: mk_wxs.pike,v 1.5 2004/11/16 12:05:30 grubba Exp $ +  * $Id: mk_wxs.pike,v 1.6 2004/11/16 12:06:49 grubba Exp $    *    * Make a Windows Installer XML Source file (wxs) suitable    * for a Roxen installer.
9:      import Standards.XML.Wix;    - #ifndef ROXEN_VERSION + #ifdef ROXEN_VERSION + constant __roxen_version__ = "4.0"; + constant __roxen_build__ = "0"; + #else   #include "../etc/include/version.h"   #endif      int main(int argc, array(string) argv)   {    string base_guid = "e0eb949e-2d84-11d9-8482-77582478aab0"; // WebServer. -  string version_str = - #ifdef ROXEN_VERSION -  "4.0.0" - #else -  __roxen_version__+"."+__roxen_build__ - #endif /* ROXEN_VERSION */ -  ; +  string version_str = __roxen_version__+"."+__roxen_build__;    string title = "Roxen Webserver";    string manufacturer = "Roxen Internet Software";    string pike_module = "Pike_module.msm";
42:    if (stringp(opt[1])) {    version_str = opt[1];    } else { -  werror("$Id: mk_wxs.pike,v 1.5 2004/11/16 12:05:30 grubba Exp $\n"); +  werror("$Id: mk_wxs.pike,v 1.6 2004/11/16 12:06:49 grubba Exp $\n");    exit(0);    }    break;