Check-in [b54de50ac5]
Not logged in
HomeFilesLeavesTimelineBranchesTagsTicketsWikiLogin
Overview

SHA1 Hash:b54de50ac5e4c6b796163685c82fccabdb0fc829
Date: 2008-11-03 09:55:46
User: urmil
Edited Comment:Update for making mycfg.exe. WARNING: This is an incompatible change. Do not use this branch of development to build a copy of fossil that needs to interoperate with official releases.
Original Comment:Update for making mycfg.exe
Timelines: ancestors | descendants | both | trunk
Other Links: files | ZIP archive | manifest

Tags And Properties
Changes
[hide diffs]

Modified Makefile.w32 from [c6249fceb5] to [01afc2365c]. 

@@ -2,11 +2,11 @@
 #
 #### The toplevel directory of the source tree.  Fossil can be built
 #    in a directory that is separate from the source tree.  Just change
 #    the following to point from the build directory to the src/ folder.
 #
-SRCDIR = ../src
+SRCDIR = src
 
 #### C Compiler and options for use in building executables that
 #    will run on the platform that is doing the build.  This is used
 #    to compile code-generator programs as part of the build process.
 #    See TCC below for the C compiler for building the finished binary.
@@ -14,11 +14,11 @@
 BCC = gcc -g -O2
 
 #### The suffix to add to executable files.  ".exe" for windows.
 #    Nothing for unix.
 #
-E =
+E = .exe
 
 #### C Compile and options for use in building executables that
 #    will run on the target platform.  This is usually the same
 #    as BCC, unless you are cross-compiling.  This C compiler builds
 #    the finished binary for fossil.  The BCC compiler above is used
@@ -25,11 +25,11 @@
 #    for building intermediate code-generator tools.
 #
 #TCC = gcc -O6
 #TCC = gcc -g -O0 -Wall -fprofile-arcs -ftest-coverage
 #TCC = gcc -g -Os -Wall
-TCC = gcc -g -Os -Wall -DFOSSIL_I18N=0 -L/usr/local/lib -I/usr/local/include
+TCC = i586-mingw32msvc-gcc -g -Os -Wall -DFOSSIL_I18N=0 -L/usr/i586-mingw32msvc/lib -I/usr/i586-mingw32msvc/include
 
 #### Extra arguments for linking the finished binary.  Fossil needs
 #    to link against the Z-Lib compression library.  There are no
 #    other dependencies.  We sometimes add the -static option here
 #    so that we can build a static executable that will run in a

Modified src/add.c from [8c54ff6ce9] to [c98911056e]. 

@@ -67,11 +67,11 @@
       fossil_fatal("cannot open %s", zName);
     }
     file_tree_name(zName, &pathname, 1);
     zPath = blob_str(&pathname);
     if( strcmp(zPath, "manifest")==0
-     || strcmp(zPath, "_FOSSIL_")==0
+     || strcmp(zPath, "_MYCFG_")==0
      || strcmp(zPath, "manifest.uuid")==0
      || blob_compare(&pathname, &repo)==0
     ){
       fossil_warning("cannot add %s", zPath);
     }else{

Modified src/checkin.c from [ad8e78b43e] to [dddffe3437]. 

@@ -170,11 +170,11 @@
   n = strlen(g.zLocalRoot);
   blob_init(&path, g.zLocalRoot, n-1);
   vfile_scan(0, &path, blob_size(&path));
   db_prepare(&q,
       "SELECT x FROM sfile"
-      " WHERE x NOT IN ('manifest','manifest.uuid','_FOSSIL_')"
+      " WHERE x NOT IN ('manifest','manifest.uuid','_MYCFG_')"
       " ORDER BY 1");
   if( file_tree_name(g.zRepositoryName, &repo, 0) ){
     db_multi_exec("DELETE FROM sfile WHERE x=%B", &repo);
   }
   while( db_step(&q)==SQLITE_ROW ){
@@ -198,19 +198,20 @@
 void clean_cmd(void){
   int allFlag;
   Blob path, repo;
   Stmt q;
   int n;
+  printf ("This feature is disabled.\n"); return;
   allFlag = find_option("all","a",0)!=0;
   db_must_be_within_tree();
   db_multi_exec("CREATE TEMP TABLE sfile(x TEXT PRIMARY KEY)");
   n = strlen(g.zLocalRoot);
   blob_init(&path, g.zLocalRoot, n-1);
   vfile_scan(0, &path, blob_size(&path));
   db_prepare(&q,
       "SELECT %Q || x FROM sfile"
-      " WHERE x NOT IN ('manifest','manifest.uuid','_FOSSIL_')"
+      " WHERE x NOT IN ('manifest','manifest.uuid','_MYCFG_')"
       " ORDER BY 1", g.zLocalRoot);
   if( file_tree_name(g.zRepositoryName, &repo, 0) ){
     db_multi_exec("DELETE FROM sfile WHERE x=%B", &repo);
   }
   while( db_step(&q)==SQLITE_ROW ){

Modified src/checkout.c from [b372b89d4e] to [5e3a8c7588]. 

@@ -203,8 +203,8 @@
   db_must_be_within_tree();
   if( !forceFlag && unsaved_changes()==1 ){
     fossil_fatal("there are unsaved changes in the current checkout");
   }
   db_close();
-  unlink(mprintf("%s_FOSSIL_", g.zLocalRoot));
-  unlink(mprintf("%s_FOSSIL_-journal", g.zLocalRoot));
+  unlink(mprintf("%s_MYCFG_", g.zLocalRoot));
+  unlink(mprintf("%s_MYCFG_-journal", g.zLocalRoot));
 }

Modified src/db.c from [ed66011978] to [7fa037b994]. 

@@ -28,11 +28,11 @@
 **
 **    (1)  The "user" database in ~/.fossil
 **
 **    (2)  The "repository" database
 **
-**    (3)  A local checkout database named "_FOSSIL_" or ".fos"
+**    (3)  A local checkout database named "_MYCFG_" or ".fos"
 **         and located at the root of the local copy of the source tree.
 **
 */
 #include "config.h"
 #ifndef __MINGW32__
@@ -601,27 +601,27 @@
   return 1;
 }
 
 /*
 ** Locate the root directory of the local repository tree.  The root
-** directory is found by searching for a file named "_FOSSIL_" or ".fos"
+** directory is found by searching for a file named "_MYCFG_" or ".fos"
 ** that contains a valid repository database.
 **
-** If no valid _FOSSIL_ or .fos file is found, we move up one level and
+** If no valid _MYCFG_ or .fos file is found, we move up one level and
 ** try again. Once the file is found, the g.zLocalRoot variable is set
 ** to the root of the repository tree and this routine returns 1.  If
 ** no database is found, then this routine return 0.
 **
 ** This routine always opens the user database regardless of whether or
-** not the repository database is found.  If the _FOSSIL_ or .fos file
+** not the repository database is found.  If the _MYCFG_ or .fos file
 ** is found, it is attached to the open database connection too.
 */
 int db_open_local(void){
   int i, n;
   char zPwd[2000];
   char *zPwdConv;
-  static const char *aDbName[] = { "/_FOSSIL_", "/.fos" };
+  static const char *aDbName[] = { "/_MYCFG_", "/.fos" };
 
   if( g.localOpen) return 1;
   if( getcwd(zPwd, sizeof(zPwd)-20)==0 ){
     db_err("pwd too big: max %d", sizeof(zPwd)-20);
   }
@@ -1139,11 +1139,11 @@
   if( db_open_local() ){
     fossil_panic("already within an open tree rooted at %s", g.zLocalRoot);
   }
   file_canonical_name(g.argv[2], &path);
   db_open_repository(blob_str(&path));
-  db_init_database("./_FOSSIL_", zLocalSchema, (char*)0);
+  db_init_database("./_MYCFG_", zLocalSchema, (char*)0);
   db_open_local();
   db_lset("repository", blob_str(&path));
   db_record_repository_filename(blob_str(&path));
   vid = db_int(0, "SELECT pid FROM plink y"
                   " WHERE NOT EXISTS(SELECT 1 FROM plink x WHERE x.cid=y.pid)");

Modified src/main.mk from [7596d8f2f4] to [d432505c6f]. 

@@ -211,11 +211,11 @@
   wikiformat.o \
   winhttp.o \
   xfer.o \
   zip.o
 
-APPNAME = fossil$(E)
+APPNAME = mycfg$(E)
 
 
 
 all:	$(APPNAME)

Fossil version [c0211010a1] 2009-12-13 01:31:36