12 Jan
2008
12 Jan
'08
5:54 p.m.
Author: hpoussin
Date: Sat Jan 12 20:54:45 2008
New Revision: 31744
URL: http://svn.reactos.org/svn/reactos?rev=31744&view=rev
Log:
[FORMATTING] Fix formatting
Modified:
trunk/reactos/tools/buildno/buildno.cpp
Modified: trunk/reactos/tools/buildno/buildno.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/buildno/buildno.cpp?…
==============================================================================
--- trunk/reactos/tools/buildno/buildno.cpp (original)
+++ trunk/reactos/tools/buildno/buildno.cpp Sat Jan 12 20:54:45 2008
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/*
* buildno - Generate the build number for ReactOS
*
* Copyright (c) 1999,2000 Emanuele Aliberti
@@ -11,9 +10,9 @@
* The build number is stored in the file
* <reactos/buildno.h> as a set of macros:
*
- * KERNEL_VERSION_BUILD base 10 number
- * KERNEL_VERSION_BUILD_STR C string
- * KERNEL_VERSION_BUILD_RC RC string
+ * KERNEL_VERSION_BUILD base 10 number
+ * KERNEL_VERSION_BUILD_STR C string
+ * KERNEL_VERSION_BUILD_RC RC string
*
* REVISIONS
* ---------
@@ -40,245 +39,229 @@
static char * filename = "";
static char * kernel_version_build_type = 0;
-#ifdef DBG
-void
-tm_dump (const char *tag, struct tm * t)
-{
- printf ("%s->tm_sec = %d\n", tag, t->tm_sec);
- printf ("%s->tm_min = %d\n", tag, t->tm_min);
- printf ("%s->tm_hour = %d\n", tag, t->tm_hour);
- printf ("%s->tm_mday = %d\n", tag, t->tm_mday);
- printf ("%s->tm_mon = %d\n", tag, t->tm_mon);
- printf ("%s->tm_year = %d\n", tag, t->tm_year);
- printf ("%s->tm_wday = %d\n", tag, t->tm_wday);
- printf ("%s->tm_yday = %d\n", tag, t->tm_yday);
- printf ("%s->tm_isdst = %d\n\n", tag, t->tm_isdst);
-}
-#endif
-
int count_wide_string( wchar_t *str )
{
- int i;
-
- for( i = 0; str[i]; i++ );
-
- return i;
+ int i;
+ for( i = 0; str[i]; i++ )
+ ;
+ return i;
}
char *
GetRev(void)
{
- static char Unknown[] = "UNKNOWN";
- static char Revision[10]; /* 999999999 revisions should be enough for everyone... */
-
- /* SVN 1.4.x */
- FILE *fp = NULL;
- char ch;
- size_t count = 0, chars = 0;
- fp = fopen(".svn/entries", "r");
- if (fp != NULL)
- {
- if (fgetc(fp) == 56) /* some kind of header? */
- {
- while((ch=fgetc(fp)) != EOF)
- {
- if (ch == 10) count++; /* seems to used as a seperator */
- if (count > 3)
- break;
- if ((count == 3) && (chars < sizeof(Revision)))
- {
- if (chars != 0)
- Revision[chars - 1] = ch;
- chars++;
- }
- }
- fclose(fp);
- return Revision;
- }
- }
-
- try
- {
- XMLElement *head;
-
- try
- {
- head = XMLLoadFile(".svn/entries");
- }
- catch(XMLFileNotFoundException)
- {
- head = XMLLoadFile("_svn/entries");
- }
- XMLElement *entries = head->subElements[0];
- for (size_t i = 0; i < entries->subElements.size(); i++)
- {
- XMLElement *entry = entries->subElements[i];
- if ("entry" == entry->name)
- {
- bool GotName = false;
- bool GotKind = false;
- bool GotRevision = false;
- for (size_t j = 0; j < entry->attributes.size(); j++)
- {
- XMLAttribute *Attribute = entry->attributes[j];
- if ("name" == Attribute->name && "" ==
Attribute->value)
- {
- GotName = true;
- }
- if ("kind" == Attribute->name && "dir"
== Attribute->value)
- {
- GotKind = true;
- }
- if ("revision" == Attribute->name)
- {
- if (sizeof(Revision) <= Attribute->value.length() + 1)
- {
- strcpy(Revision, "revtoobig");
- }
- else
- {
- strcpy(Revision, Attribute->value.c_str());
- }
- GotRevision = true;
- }
- if (GotName && GotKind && GotRevision)
- {
- delete head;
- return Revision;
- }
- }
- }
- }
-
- delete head;
- }
- catch(...)
- {
- ;
- }
-
- return Unknown;
+ static char Unknown[] = "UNKNOWN";
+ static char Revision[10]; /* 999999999 revisions should be enough for everyone... */
+
+ /* SVN 1.4.x */
+ FILE *fp = NULL;
+ char ch;
+ size_t count = 0, chars = 0;
+ fp = fopen(".svn/entries", "r");
+ if (fp != NULL)
+ {
+ if (fgetc(fp) == 56) /* some kind of header? */
+ {
+ while((ch=fgetc(fp)) != EOF)
+ {
+ if (ch == 10)
+ count++; /* seems to used as a seperator */
+ if (count > 3)
+ break;
+ if ((count == 3) && (chars < sizeof(Revision)))
+ {
+ if (chars != 0)
+ Revision[chars - 1] = ch;
+ chars++;
+ }
+ }
+ fclose(fp);
+ return Revision;
+ }
+ }
+
+ try
+ {
+ XMLElement *head;
+
+ try
+ {
+ head = XMLLoadFile(".svn/entries");
+ }
+ catch(XMLFileNotFoundException)
+ {
+ head = XMLLoadFile("_svn/entries");
+ }
+ XMLElement *entries = head->subElements[0];
+ for (size_t i = 0; i < entries->subElements.size(); i++)
+ {
+ XMLElement *entry = entries->subElements[i];
+ if ("entry" == entry->name)
+ {
+ bool GotName = false;
+ bool GotKind = false;
+ bool GotRevision = false;
+ for (size_t j = 0; j < entry->attributes.size(); j++)
+ {
+ XMLAttribute *Attribute = entry->attributes[j];
+ if ("name" == Attribute->name && "" ==
Attribute->value)
+ {
+ GotName = true;
+ }
+ if ("kind" == Attribute->name && "dir" ==
Attribute->value)
+ {
+ GotKind = true;
+ }
+ if ("revision" == Attribute->name)
+ {
+ if (sizeof(Revision) <= Attribute->value.length() + 1)
+ {
+ strcpy(Revision, "revtoobig");
+ }
+ else
+ {
+ strcpy(Revision, Attribute->value.c_str());
+ }
+ GotRevision = true;
+ }
+ if (GotName && GotKind && GotRevision)
+ {
+ delete head;
+ return Revision;
+ }
+ }
+ }
+ }
+
+ delete head;
+ }
+ catch(...)
+ {
+ ;
+ }
+
+ return Unknown;
}
void
write_h (int build, char *buildstr)
{
- FILE *h = NULL;
- char* s;
- char* s1;
- unsigned int length;
- int dllversion = KERNEL_VERSION_MAJOR + 42;
-
- s1 = s = (char *) malloc(256 * 1024);
-
- s = s + sprintf (s, "/* Do not edit - Machine generated */\n");
-
- s = s + sprintf (s, "#ifndef _INC_REACTOS_BUILDNO\n" );
- s = s + sprintf (s, "#define _INC_REACTOS_BUILDNO\n" );
-
- s = s + sprintf (s, "#define KERNEL_VERSION_BUILD\t%d\n", build);
- s = s + sprintf (s, "#define KERNEL_VERSION_BUILD_HEX\t0x%x\n",
atoi(GetRev()));
- s = s + sprintf (s, "#define KERNEL_VERSION_BUILD_STR\t\"%s\"\n",
buildstr);
- s = s + sprintf (s, "#define KERNEL_VERSION_BUILD_RC\t\"%s\\0\"\n",
buildstr);
- s = s + sprintf (s, "#define KERNEL_RELEASE_RC\t\"%d.%d",
- KERNEL_VERSION_MAJOR, KERNEL_VERSION_MINOR);
- if (0 != KERNEL_VERSION_PATCH_LEVEL)
- {
- s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL);
- }
- s = s + sprintf (s, "-%s\\0\"\n", kernel_version_build_type);
- s = s + sprintf (s, "#define KERNEL_RELEASE_STR\t\"%d.%d",
- KERNEL_VERSION_MAJOR,
- KERNEL_VERSION_MINOR);
- if (0 != KERNEL_VERSION_PATCH_LEVEL)
- {
- s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL);
- }
- s = s + sprintf (s, "-%s\"\n", kernel_version_build_type);
- s = s + sprintf (s, "#define KERNEL_VERSION_RC\t\"%d.%d",
- KERNEL_VERSION_MAJOR,
- KERNEL_VERSION_MINOR);
- if (0 != KERNEL_VERSION_PATCH_LEVEL)
- {
- s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL);
- }
- s = s + sprintf (s, "-%s\\0\"\n", kernel_version_build_type);
- s = s + sprintf (s, "#define KERNEL_VERSION_STR\t\"%d.%d",
- KERNEL_VERSION_MAJOR,
- KERNEL_VERSION_MINOR);
- if (0 != KERNEL_VERSION_PATCH_LEVEL)
- {
- s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL);
- }
- s = s + sprintf (s, "-%s\"\n", kernel_version_build_type);
- s = s + sprintf (s, "#define REACTOS_DLL_VERSION_MAJOR\t%d\n", dllversion);
- s = s + sprintf (s, "#define REACTOS_DLL_RELEASE_RC\t\"%d.%d",
- dllversion, KERNEL_VERSION_MINOR);
- if (0 != KERNEL_VERSION_PATCH_LEVEL)
- {
- s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL);
- }
- s = s + sprintf (s, "-%s\\0\"\n", kernel_version_build_type);
- s = s + sprintf (s, "#define REACTOS_DLL_RELEASE_STR\t\"%d.%d",
- dllversion,
- KERNEL_VERSION_MINOR);
- if (0 != KERNEL_VERSION_PATCH_LEVEL)
- {
- s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL);
- }
- s = s + sprintf (s, "-%s\"\n", kernel_version_build_type);
- s = s + sprintf (s, "#define REACTOS_DLL_VERSION_RC\t\"%d.%d",
- dllversion,
- KERNEL_VERSION_MINOR);
- if (0 != KERNEL_VERSION_PATCH_LEVEL)
- {
- s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL);
- }
- s = s + sprintf (s, "-%s\\0\"\n", kernel_version_build_type);
- s = s + sprintf (s, "#define REACTOS_DLL_VERSION_STR\t\"%d.%d",
- dllversion,
- KERNEL_VERSION_MINOR);
- if (0 != KERNEL_VERSION_PATCH_LEVEL)
- {
- s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL);
- }
- s = s + sprintf (s, "-%s\"\n", kernel_version_build_type);
- s = s + sprintf (s, "#endif\n/* EOF */\n");
-
- h = fopen (filename, "wb");
- if (h != NULL)
- {
- fseek(h, 0, SEEK_END);
- length = ftell(h);
- if (length == strlen(s1))
- {
- char* orig;
-
- orig = (char *) malloc(length);
- fseek(h, 0, SEEK_SET);
- fread(orig, 1, length, h);
- if (memcmp(s1, orig, length) == 0)
- {
- fclose(h);
- free(s1);
- return;
- }
- }
- fclose(h);
- }
-
- h = fopen (filename, "wb");
- if (!h)
- {
- fprintf (stderr,
- "%s: can not create file \"%s\"!\n",
- argv0,
- filename);
- free(s1);
- return;
- }
- fwrite(s1, 1, strlen(s1), h);
- fclose (h);
+ FILE *h = NULL;
+ char* s;
+ char* s1;
+ unsigned int length;
+ int dllversion = KERNEL_VERSION_MAJOR + 42;
+
+ s1 = s = (char *) malloc(256 * 1024);
+
+ s = s + sprintf (s, "/* Do not edit - Machine generated */\n");
+
+ s = s + sprintf (s, "#ifndef _INC_REACTOS_BUILDNO\n" );
+ s = s + sprintf (s, "#define _INC_REACTOS_BUILDNO\n" );
+
+ s = s + sprintf (s, "#define KERNEL_VERSION_BUILD\t%d\n", build);
+ s = s + sprintf (s, "#define KERNEL_VERSION_BUILD_HEX\t0x%x\n",
atoi(GetRev()));
+ s = s + sprintf (s, "#define KERNEL_VERSION_BUILD_STR\t\"%s\"\n",
buildstr);
+ s = s + sprintf (s, "#define KERNEL_VERSION_BUILD_RC\t\"%s\\0\"\n",
buildstr);
+ s = s + sprintf (s, "#define KERNEL_RELEASE_RC\t\"%d.%d",
+ KERNEL_VERSION_MAJOR, KERNEL_VERSION_MINOR);
+ if (0 != KERNEL_VERSION_PATCH_LEVEL)
+ {
+ s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL);
+ }
+ s = s + sprintf (s, "-%s\\0\"\n", kernel_version_build_type);
+ s = s + sprintf (s, "#define KERNEL_RELEASE_STR\t\"%d.%d",
+ KERNEL_VERSION_MAJOR,
+ KERNEL_VERSION_MINOR);
+ if (0 != KERNEL_VERSION_PATCH_LEVEL)
+ {
+ s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL);
+ }
+ s = s + sprintf (s, "-%s\"\n", kernel_version_build_type);
+ s = s + sprintf (s, "#define KERNEL_VERSION_RC\t\"%d.%d",
+ KERNEL_VERSION_MAJOR,
+ KERNEL_VERSION_MINOR);
+ if (0 != KERNEL_VERSION_PATCH_LEVEL)
+ {
+ s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL);
+ }
+ s = s + sprintf (s, "-%s\\0\"\n", kernel_version_build_type);
+ s = s + sprintf (s, "#define KERNEL_VERSION_STR\t\"%d.%d",
+ KERNEL_VERSION_MAJOR,
+ KERNEL_VERSION_MINOR);
+ if (0 != KERNEL_VERSION_PATCH_LEVEL)
+ {
+ s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL);
+ }
+ s = s + sprintf (s, "-%s\"\n", kernel_version_build_type);
+ s = s + sprintf (s, "#define REACTOS_DLL_VERSION_MAJOR\t%d\n", dllversion);
+ s = s + sprintf (s, "#define REACTOS_DLL_RELEASE_RC\t\"%d.%d",
+ dllversion, KERNEL_VERSION_MINOR);
+ if (0 != KERNEL_VERSION_PATCH_LEVEL)
+ {
+ s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL);
+ }
+ s = s + sprintf (s, "-%s\\0\"\n", kernel_version_build_type);
+ s = s + sprintf (s, "#define REACTOS_DLL_RELEASE_STR\t\"%d.%d",
+ dllversion,
+ KERNEL_VERSION_MINOR);
+ if (0 != KERNEL_VERSION_PATCH_LEVEL)
+ {
+ s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL);
+ }
+ s = s + sprintf (s, "-%s\"\n", kernel_version_build_type);
+ s = s + sprintf (s, "#define REACTOS_DLL_VERSION_RC\t\"%d.%d",
+ dllversion,
+ KERNEL_VERSION_MINOR);
+ if (0 != KERNEL_VERSION_PATCH_LEVEL)
+ {
+ s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL);
+ }
+ s = s + sprintf (s, "-%s\\0\"\n", kernel_version_build_type);
+ s = s + sprintf (s, "#define REACTOS_DLL_VERSION_STR\t\"%d.%d",
+ dllversion,
+ KERNEL_VERSION_MINOR);
+ if (0 != KERNEL_VERSION_PATCH_LEVEL)
+ {
+ s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL);
+ }
+ s = s + sprintf (s, "-%s\"\n", kernel_version_build_type);
+ s = s + sprintf (s, "#endif\n/* EOF */\n");
+
+ h = fopen (filename, "wb");
+ if (h != NULL)
+ {
+ fseek(h, 0, SEEK_END);
+ length = ftell(h);
+ if (length == strlen(s1))
+ {
+ char* orig;
+
+ orig = (char *) malloc(length);
+ fseek(h, 0, SEEK_SET);
+ fread(orig, 1, length, h);
+ if (memcmp(s1, orig, length) == 0)
+ {
+ fclose(h);
+ free(s1);
+ return;
+ }
+ }
+ fclose(h);
+ }
+
+ h = fopen (filename, "wb");
+ if (!h)
+ {
+ fprintf (stderr,
+ "%s: can not create file \"%s\"!\n",
+ argv0,
+ filename);
+ free(s1);
+ return;
+ }
+ fwrite(s1, 1, strlen(s1), h);
+ fclose (h);
}
void
@@ -286,9 +269,10 @@
{
fprintf (
stderr,
- "Usage: %s [-{p|q}] path-to-header\n\n -p print version number and exit\n -q
run in quiet mode\n",
- argv0
- );
+ "Usage: %s [-{p|q}] path-to-header\n\n"
+ " -p print version number and exit\n"
+ " -q run in quiet mode\n",
+ argv0);
exit (EXIT_SUCCESS);
}
@@ -296,15 +280,15 @@
int
main (int argc, char * argv [])
{
- int i, length;
- int print_only = FALSE;
- int quiet = FALSE;
-
- int build = 0;
- char buildstr[64];
-
- time_t t1 = 0;
- struct tm * t1_tm = NULL;
+ int i, length;
+ int print_only = FALSE;
+ int quiet = FALSE;
+
+ int build = 0;
+ char buildstr[64];
+
+ time_t t1 = 0;
+ struct tm * t1_tm = NULL;
argv0 = argv[0];
@@ -342,13 +326,9 @@
default:
usage ();
}
- /*
- * Set TZ information.
- */
+ /* Set TZ information. */
tzset ();
- /*
- * We are building TODAY!
- */
+ /* We are building TODAY! */
if (! quiet)
{
printf ( "\nReactOS Build Number Generator\n\n");
@@ -357,34 +337,28 @@
/* Convert kernel_version_build_type to a host-friendly string */
length = count_wide_string(KERNEL_VERSION_BUILD_TYPE);
kernel_version_build_type = (char *)malloc(length+1);
- for( i = 0; KERNEL_VERSION_BUILD_TYPE[i]; i++ ) {
- kernel_version_build_type[i] = KERNEL_VERSION_BUILD_TYPE[i];
+ for( i = 0; KERNEL_VERSION_BUILD_TYPE[i]; i++ )
+ {
+ kernel_version_build_type[i] = KERNEL_VERSION_BUILD_TYPE[i];
}
kernel_version_build_type[i] = 0;
time (& t1); /* current build time */
t1_tm = gmtime (& t1);
-#ifdef DBG
- tm_dump ("t1", t1_tm);
-#endif
t1_tm->tm_year += 1900;
-#ifdef DBG
- tm_dump ("t1", t1_tm);
-#endif
if (! quiet)
{
printf (
"Current date: %4d-%02d-%02d\n\n",
t1_tm->tm_year,
(t1_tm->tm_mon + 1),
- t1_tm->tm_mday
- );
+ t1_tm->tm_mday);
}
/*
* Compute build number.
*/
- build = t1_tm->tm_year * 10000 + (t1_tm->tm_mon + 1) * 100 + t1_tm->tm_mday;
+ build = t1_tm->tm_year * 10000 + (t1_tm->tm_mon + 1) * 100 + t1_tm->tm_mday;
sprintf(buildstr, "%d-r%s", build, GetRev());
@@ -393,18 +367,14 @@
printf (
"ROS Version : %d.%d",
KERNEL_VERSION_MAJOR,
- KERNEL_VERSION_MINOR
- );
+ KERNEL_VERSION_MINOR);
if (0 != KERNEL_VERSION_PATCH_LEVEL)
{
printf(".%d", KERNEL_VERSION_PATCH_LEVEL);
}
printf("-%s (Build %s)\n\n", kernel_version_build_type, buildstr);
}
- /*
- * (Over)write the include file, unless
- * the user switched on -p.
- */
+ /* (Over)write the include file, unless the user switched on -p. */
if (! print_only)
{
write_h (build, buildstr);
@@ -419,5 +389,4 @@
return EXIT_SUCCESS;
}
-
/* EOF */
6152
days inactive
6152
days old
0 comments
1 participants
participants (1)
-
hpoussin＠svn.reactos.org