Fossil SCM

merged from trunk

wolfgang 2010-10-07 16:04 UTC wolfgangFormat2CSS_2 merge

Commit 2502567f70d52fd8221c15bc6ae984ee4eea292e

Parent ffbfb4d57c7d40d…

6 files changed +1 +36 -37 +1 -1 +3 +11 -5 +11 -5

~ src/http_ssl.c ~ src/sqlite3.c ~ src/sqlite3.h ~ src/timeline.c ~ win/Makefile.dmc ~ win/Makefile.dmc

M src/http_ssl.c

		--- src/http_ssl.c
		+++ src/http_ssl.c
		@@ -90,10 +90,11 @@
90	90	SSL_library_init();
91	91	SSL_load_error_strings();
92	92	ERR_load_BIO_strings();
93	93	OpenSSL_add_all_algorithms();
94	94	sslCtx = SSL_CTX_new(SSLv23_client_method());
	95	+ X509_STORE_set_default_paths(SSL_CTX_get_cert_store(sslCtx));
95	96	sslIsInit = 1;
96	97	}
97	98	}
98	99
99	100	/*
100	101

	--- src/http_ssl.c
	+++ src/http_ssl.c
	@@ -90,10 +90,11 @@
90	SSL_library_init();
91	SSL_load_error_strings();
92	ERR_load_BIO_strings();
93	OpenSSL_add_all_algorithms();
94	sslCtx = SSL_CTX_new(SSLv23_client_method());

95	sslIsInit = 1;
96	}
97	}
98
99	/*
100

	--- src/http_ssl.c
	+++ src/http_ssl.c
	@@ -90,10 +90,11 @@
90	SSL_library_init();
91	SSL_load_error_strings();
92	ERR_load_BIO_strings();
93	OpenSSL_add_all_algorithms();
94	sslCtx = SSL_CTX_new(SSLv23_client_method());
95	X509_STORE_set_default_paths(SSL_CTX_get_cert_store(sslCtx));
96	sslIsInit = 1;
97	}
98	}
99
100	/*
101

M src/sqlite3.c

+36 -37

		--- src/sqlite3.c
		+++ src/sqlite3.c
		@@ -650,11 +650,11 @@
650	650	** [sqlite3_libversion_number()], [sqlite3_sourceid()],
651	651	** [sqlite_version()] and [sqlite_source_id()].
652	652	*/
653	653	#define SQLITE_VERSION "3.7.3"
654	654	#define SQLITE_VERSION_NUMBER 3007003
655		-#define SQLITE_SOURCE_ID "2010-10-04 23:55:51 ece641eb8951c6314cedbdb3243f91cb199c3239"
	655	+#define SQLITE_SOURCE_ID "2010-10-07 13:29:13 e55ada89246d4cc5f476891c70572dc7c1c3643e"
656	656
657	657	/*
658	658	** CAPI3REF: Run-Time Library Version Numbers
659	659	** KEYWORDS: sqlite3_version, sqlite3_sourceid
660	660	**
		@@ -26956,16 +26956,26 @@
26956	26956
26957	26957	/* Parameter isDelete is only used on vxworks. Express this explicitly
26958	26958	** here to prevent compiler warnings about unused parameters.
26959	26959	*/
26960	26960	UNUSED_PARAMETER(isDelete);
	26961	+
	26962	+ /* Usually the path zFilename should not be a relative pathname. The
	26963	+ ** exception is when opening the proxy "conch" file in builds that
	26964	+ ** include the special Apple locking styles.
	26965	+ */
	26966	+#if defined(__APPLE__) && SQLITE_ENABLE_LOCKING_STYLE
	26967	+ assert( zFilename==0 \|\| zFilename[0]=='/'
	26968	+ \|\| pVfs->pAppData==(void*)&autolockIoFinder );
	26969	+#else
	26970	+ assert( zFilename==0 \|\| zFilename[0]=='/' );
	26971	+#endif
26961	26972
26962	26973	OSTRACE(("OPEN %-3d %s\n", h, zFilename));
26963	26974	pNew->h = h;
26964	26975	pNew->dirfd = dirfd;
26965	26976	pNew->fileFlags = 0;
26966		- assert( zFilename==0 \|\| zFilename[0]=='/' ); /* Never a relative pathname */
26967	26977	pNew->zPath = zFilename;
26968	26978
26969	26979	#if OS_VXWORKS
26970	26980	pNew->pId = vxworksFindFileId(zFilename);
26971	26981	if( pNew->pId==0 ){
		@@ -39764,34 +39774,34 @@
39764	39774	/* Higher-level routines never call this function if database is not
39765	39775	** writable. But check anyway, just for robustness. */
39766	39776	if( NEVER(pPager->readOnly) ) return SQLITE_PERM;
39767	39777
39768	39778	CHECK_PAGE(pPg);
	39779	+
	39780	+ /* The journal file needs to be opened. Higher level routines have already
	39781	+ ** obtained the necessary locks to begin the write-transaction, but the
	39782	+ ** rollback journal might not yet be open. Open it now if this is the case.
	39783	+ **
	39784	+ ** This is done before calling sqlite3PcacheMakeDirty() on the page.
	39785	+ ** Otherwise, if it were done after calling sqlite3PcacheMakeDirty(), then
	39786	+ ** an error might occur and the pager would end up in WRITER_LOCKED state
	39787	+ ** with pages marked as dirty in the cache.
	39788	+ */
	39789	+ if( pPager->eState==PAGER_WRITER_LOCKED ){
	39790	+ rc = pager_open_journal(pPager);
	39791	+ if( rc!=SQLITE_OK ) return rc;
	39792	+ }
	39793	+ assert( pPager->eState>=PAGER_WRITER_CACHEMOD );
	39794	+ assert( assert_pager_state(pPager) );
39769	39795
39770	39796	/* Mark the page as dirty. If the page has already been written
39771	39797	** to the journal then we can return right away.
39772	39798	*/
39773	39799	sqlite3PcacheMakeDirty(pPg);
39774	39800	if( pageInJournal(pPg) && !subjRequiresPage(pPg) ){
39775	39801	assert( !pagerUseWal(pPager) );
39776		- assert( pPager->eState>=PAGER_WRITER_CACHEMOD );
39777	39802	}else{
39778		-
39779		- /* If we get this far, it means that the page needs to be
39780		- ** written to the transaction journal or the checkpoint journal
39781		- ** or both.
39782		- **
39783		- ** Higher level routines have already obtained the necessary locks
39784		- ** to begin the write-transaction, but the rollback journal might not
39785		- ** yet be open. Open it now if this is the case.
39786		- */
39787		- if( pPager->eState==PAGER_WRITER_LOCKED ){
39788		- rc = pager_open_journal(pPager);
39789		- if( rc!=SQLITE_OK ) return rc;
39790		- }
39791		- assert( pPager->eState>=PAGER_WRITER_CACHEMOD );
39792		- assert( assert_pager_state(pPager) );
39793	39803
39794	39804	/* The transaction journal now exists and we have a RESERVED or an
39795	39805	** EXCLUSIVE lock on the main database file. Write the current page to
39796	39806	** the transaction journal if it is not there already.
39797	39807	*/
		@@ -43589,11 +43599,11 @@
43589	43599	** it sets pWal->hdr.mxFrame to 0. Otherwise, pWal->hdr.mxFrame is left
43590	43600	** unchanged.
43591	43601	**
43592	43602	** SQLITE_OK is returned if no error is encountered (regardless of whether
43593	43603	** or not pWal->hdr.mxFrame is modified). An SQLite error code is returned
43594		-** if some error
	43604	+** if an error occurs.
43595	43605	*/
43596	43606	static int walRestartLog(Wal *pWal){
43597	43607	int rc = SQLITE_OK;
43598	43608	int cnt;
43599	43609
		@@ -43622,10 +43632,12 @@
43622	43632	walIndexWriteHdr(pWal);
43623	43633	pInfo->nBackfill = 0;
43624	43634	for(i=1; i<WAL_NREADER; i++) pInfo->aReadMark[i] = READMARK_NOT_USED;
43625	43635	assert( pInfo->aReadMark[0]==0 );
43626	43636	walUnlockExclusive(pWal, WAL_READ_LOCK(1), WAL_NREADER-1);
	43637	+ }else if( rc!=SQLITE_BUSY ){
	43638	+ return rc;
43627	43639	}
43628	43640	}
43629	43641	walUnlockShared(pWal, WAL_READ_LOCK(0));
43630	43642	pWal->readLock = -1;
43631	43643	cnt = 0;
		@@ -54130,18 +54142,11 @@
54130	54142	}else if( pMem->flags & MEM_Int ){
54131	54143	return (double)pMem->u.i;
54132	54144	}else if( pMem->flags & (MEM_Str\|MEM_Blob) ){
54133	54145	/* (double)0 In case of SQLITE_OMIT_FLOATING_POINT... */
54134	54146	double val = (double)0;
54135		- pMem->flags \|= MEM_Str;
54136		- if( sqlite3VdbeChangeEncoding(pMem, SQLITE_UTF8)
54137		- \|\| sqlite3VdbeMemNulTerminate(pMem) ){
54138		- /* (double)0 In case of SQLITE_OMIT_FLOATING_POINT... */
54139		- return (double)0;
54140		- }
54141		- assert( pMem->z );
54142		- sqlite3AtoF(pMem->z, &val, pMem->n, SQLITE_UTF8);
	54147	+ sqlite3AtoF(pMem->z, &val, pMem->n, pMem->enc);
54143	54148	return val;
54144	54149	}else{
54145	54150	/* (double)0 In case of SQLITE_OMIT_FLOATING_POINT... */
54146	54151	return (double)0;
54147	54152	}
		@@ -87647,11 +87652,10 @@
87647	87652	addr2 = sqlite3VdbeAddOp0(v, OP_Goto);
87648	87653	sqlite3VdbeJumpHere(v, addr1);
87649	87654	sqlite3VdbeAddOp1(v, OP_Last, pOrderBy->iECursor);
87650	87655	sqlite3VdbeAddOp1(v, OP_Delete, pOrderBy->iECursor);
87651	87656	sqlite3VdbeJumpHere(v, addr2);
87652		- pSelect->iLimit = 0;
87653	87657	}
87654	87658	}
87655	87659
87656	87660	/*
87657	87661	** Add code to implement the OFFSET
		@@ -87926,15 +87930,15 @@
87926	87930	break;
87927	87931	}
87928	87932	#endif
87929	87933	}
87930	87934
87931		- /* Jump to the end of the loop if the LIMIT is reached.
	87935	+ /* Jump to the end of the loop if the LIMIT is reached. Except, if
	87936	+ ** there is a sorter, in which case the sorter has already limited
	87937	+ ** the output for us.
87932	87938	*/
87933		- if( p->iLimit ){
87934		- assert( pOrderBy==0 ); /* If there is an ORDER BY, the call to
87935		- ** pushOntoSorter() would have cleared p->iLimit */
	87939	+ if( pOrderBy==0 && p->iLimit ){
87936	87940	sqlite3VdbeAddOp3(v, OP_IfZero, p->iLimit, iBreak, -1);
87937	87941	}
87938	87942	}
87939	87943
87940	87944	/*
		@@ -88065,14 +88069,10 @@
88065	88069	}
88066	88070	}
88067	88071	sqlite3ReleaseTempReg(pParse, regRow);
88068	88072	sqlite3ReleaseTempReg(pParse, regRowid);
88069	88073
88070		- /* LIMIT has been implemented by the pushOntoSorter() routine.
88071		- */
88072		- assert( p->iLimit==0 );
88073		-
88074	88074	/* The bottom of the loop
88075	88075	*/
88076	88076	sqlite3VdbeResolveLabel(v, addrContinue);
88077	88077	sqlite3VdbeAddOp2(v, OP_Next, iTab, addr);
88078	88078	sqlite3VdbeResolveLabel(v, addrBreak);
		@@ -89386,11 +89386,10 @@
89386	89386	}
89387	89387
89388	89388	/* Separate the left and the right query from one another
89389	89389	*/
89390	89390	p->pPrior = 0;
89391		- pPrior->pRightmost = 0;
89392	89391	sqlite3ResolveOrderGroupBy(pParse, p, p->pOrderBy, "ORDER");
89393	89392	if( pPrior->pPrior==0 ){
89394	89393	sqlite3ResolveOrderGroupBy(pParse, pPrior, pPrior->pOrderBy, "ORDER");
89395	89394	}
89396	89395
89397	89396

	--- src/sqlite3.c
	+++ src/sqlite3.c
	@@ -650,11 +650,11 @@
650	** [sqlite3_libversion_number()], [sqlite3_sourceid()],
651	** [sqlite_version()] and [sqlite_source_id()].
652	*/
653	#define SQLITE_VERSION "3.7.3"
654	#define SQLITE_VERSION_NUMBER 3007003
655	#define SQLITE_SOURCE_ID "2010-10-04 23:55:51 ece641eb8951c6314cedbdb3243f91cb199c3239"
656
657	/*
658	** CAPI3REF: Run-Time Library Version Numbers
659	** KEYWORDS: sqlite3_version, sqlite3_sourceid
660	**
	@@ -26956,16 +26956,26 @@
26956
26957	/* Parameter isDelete is only used on vxworks. Express this explicitly
26958	** here to prevent compiler warnings about unused parameters.
26959	*/
26960	UNUSED_PARAMETER(isDelete);











26961
26962	OSTRACE(("OPEN %-3d %s\n", h, zFilename));
26963	pNew->h = h;
26964	pNew->dirfd = dirfd;
26965	pNew->fileFlags = 0;
26966	assert( zFilename==0 \|\| zFilename[0]=='/' ); /* Never a relative pathname */
26967	pNew->zPath = zFilename;
26968
26969	#if OS_VXWORKS
26970	pNew->pId = vxworksFindFileId(zFilename);
26971	if( pNew->pId==0 ){
	@@ -39764,34 +39774,34 @@
39764	/* Higher-level routines never call this function if database is not
39765	** writable. But check anyway, just for robustness. */
39766	if( NEVER(pPager->readOnly) ) return SQLITE_PERM;
39767
39768	CHECK_PAGE(pPg);
















39769
39770	/* Mark the page as dirty. If the page has already been written
39771	** to the journal then we can return right away.
39772	*/
39773	sqlite3PcacheMakeDirty(pPg);
39774	if( pageInJournal(pPg) && !subjRequiresPage(pPg) ){
39775	assert( !pagerUseWal(pPager) );
39776	assert( pPager->eState>=PAGER_WRITER_CACHEMOD );
39777	}else{
39778
39779	/* If we get this far, it means that the page needs to be
39780	** written to the transaction journal or the checkpoint journal
39781	** or both.
39782	**
39783	** Higher level routines have already obtained the necessary locks
39784	** to begin the write-transaction, but the rollback journal might not
39785	** yet be open. Open it now if this is the case.
39786	*/
39787	if( pPager->eState==PAGER_WRITER_LOCKED ){
39788	rc = pager_open_journal(pPager);
39789	if( rc!=SQLITE_OK ) return rc;
39790	}
39791	assert( pPager->eState>=PAGER_WRITER_CACHEMOD );
39792	assert( assert_pager_state(pPager) );
39793
39794	/* The transaction journal now exists and we have a RESERVED or an
39795	** EXCLUSIVE lock on the main database file. Write the current page to
39796	** the transaction journal if it is not there already.
39797	*/
	@@ -43589,11 +43599,11 @@
43589	** it sets pWal->hdr.mxFrame to 0. Otherwise, pWal->hdr.mxFrame is left
43590	** unchanged.
43591	**
43592	** SQLITE_OK is returned if no error is encountered (regardless of whether
43593	** or not pWal->hdr.mxFrame is modified). An SQLite error code is returned
43594	** if some error
43595	*/
43596	static int walRestartLog(Wal *pWal){
43597	int rc = SQLITE_OK;
43598	int cnt;
43599
	@@ -43622,10 +43632,12 @@
43622	walIndexWriteHdr(pWal);
43623	pInfo->nBackfill = 0;
43624	for(i=1; i<WAL_NREADER; i++) pInfo->aReadMark[i] = READMARK_NOT_USED;
43625	assert( pInfo->aReadMark[0]==0 );
43626	walUnlockExclusive(pWal, WAL_READ_LOCK(1), WAL_NREADER-1);


43627	}
43628	}
43629	walUnlockShared(pWal, WAL_READ_LOCK(0));
43630	pWal->readLock = -1;
43631	cnt = 0;
	@@ -54130,18 +54142,11 @@
54130	}else if( pMem->flags & MEM_Int ){
54131	return (double)pMem->u.i;
54132	}else if( pMem->flags & (MEM_Str\|MEM_Blob) ){
54133	/* (double)0 In case of SQLITE_OMIT_FLOATING_POINT... */
54134	double val = (double)0;
54135	pMem->flags \|= MEM_Str;
54136	if( sqlite3VdbeChangeEncoding(pMem, SQLITE_UTF8)
54137	\|\| sqlite3VdbeMemNulTerminate(pMem) ){
54138	/* (double)0 In case of SQLITE_OMIT_FLOATING_POINT... */
54139	return (double)0;
54140	}
54141	assert( pMem->z );
54142	sqlite3AtoF(pMem->z, &val, pMem->n, SQLITE_UTF8);
54143	return val;
54144	}else{
54145	/* (double)0 In case of SQLITE_OMIT_FLOATING_POINT... */
54146	return (double)0;
54147	}
	@@ -87647,11 +87652,10 @@
87647	addr2 = sqlite3VdbeAddOp0(v, OP_Goto);
87648	sqlite3VdbeJumpHere(v, addr1);
87649	sqlite3VdbeAddOp1(v, OP_Last, pOrderBy->iECursor);
87650	sqlite3VdbeAddOp1(v, OP_Delete, pOrderBy->iECursor);
87651	sqlite3VdbeJumpHere(v, addr2);
87652	pSelect->iLimit = 0;
87653	}
87654	}
87655
87656	/*
87657	** Add code to implement the OFFSET
	@@ -87926,15 +87930,15 @@
87926	break;
87927	}
87928	#endif
87929	}
87930
87931	/* Jump to the end of the loop if the LIMIT is reached.


87932	*/
87933	if( p->iLimit ){
87934	assert( pOrderBy==0 ); /* If there is an ORDER BY, the call to
87935	** pushOntoSorter() would have cleared p->iLimit */
87936	sqlite3VdbeAddOp3(v, OP_IfZero, p->iLimit, iBreak, -1);
87937	}
87938	}
87939
87940	/*
	@@ -88065,14 +88069,10 @@
88065	}
88066	}
88067	sqlite3ReleaseTempReg(pParse, regRow);
88068	sqlite3ReleaseTempReg(pParse, regRowid);
88069
88070	/* LIMIT has been implemented by the pushOntoSorter() routine.
88071	*/
88072	assert( p->iLimit==0 );
88073
88074	/* The bottom of the loop
88075	*/
88076	sqlite3VdbeResolveLabel(v, addrContinue);
88077	sqlite3VdbeAddOp2(v, OP_Next, iTab, addr);
88078	sqlite3VdbeResolveLabel(v, addrBreak);
	@@ -89386,11 +89386,10 @@
89386	}
89387
89388	/* Separate the left and the right query from one another
89389	*/
89390	p->pPrior = 0;
89391	pPrior->pRightmost = 0;
89392	sqlite3ResolveOrderGroupBy(pParse, p, p->pOrderBy, "ORDER");
89393	if( pPrior->pPrior==0 ){
89394	sqlite3ResolveOrderGroupBy(pParse, pPrior, pPrior->pOrderBy, "ORDER");
89395	}
89396
89397

	--- src/sqlite3.c
	+++ src/sqlite3.c
	@@ -650,11 +650,11 @@
650	** [sqlite3_libversion_number()], [sqlite3_sourceid()],
651	** [sqlite_version()] and [sqlite_source_id()].
652	*/
653	#define SQLITE_VERSION "3.7.3"
654	#define SQLITE_VERSION_NUMBER 3007003
655	#define SQLITE_SOURCE_ID "2010-10-07 13:29:13 e55ada89246d4cc5f476891c70572dc7c1c3643e"
656
657	/*
658	** CAPI3REF: Run-Time Library Version Numbers
659	** KEYWORDS: sqlite3_version, sqlite3_sourceid
660	**
	@@ -26956,16 +26956,26 @@
26956
26957	/* Parameter isDelete is only used on vxworks. Express this explicitly
26958	** here to prevent compiler warnings about unused parameters.
26959	*/
26960	UNUSED_PARAMETER(isDelete);
26961
26962	/* Usually the path zFilename should not be a relative pathname. The
26963	** exception is when opening the proxy "conch" file in builds that
26964	** include the special Apple locking styles.
26965	*/
26966	#if defined(__APPLE__) && SQLITE_ENABLE_LOCKING_STYLE
26967	assert( zFilename==0 \|\| zFilename[0]=='/'
26968	\|\| pVfs->pAppData==(void*)&autolockIoFinder );
26969	#else
26970	assert( zFilename==0 \|\| zFilename[0]=='/' );
26971	#endif
26972
26973	OSTRACE(("OPEN %-3d %s\n", h, zFilename));
26974	pNew->h = h;
26975	pNew->dirfd = dirfd;
26976	pNew->fileFlags = 0;

26977	pNew->zPath = zFilename;
26978
26979	#if OS_VXWORKS
26980	pNew->pId = vxworksFindFileId(zFilename);
26981	if( pNew->pId==0 ){
	@@ -39764,34 +39774,34 @@
39774	/* Higher-level routines never call this function if database is not
39775	** writable. But check anyway, just for robustness. */
39776	if( NEVER(pPager->readOnly) ) return SQLITE_PERM;
39777
39778	CHECK_PAGE(pPg);
39779
39780	/* The journal file needs to be opened. Higher level routines have already
39781	** obtained the necessary locks to begin the write-transaction, but the
39782	** rollback journal might not yet be open. Open it now if this is the case.
39783	**
39784	** This is done before calling sqlite3PcacheMakeDirty() on the page.
39785	** Otherwise, if it were done after calling sqlite3PcacheMakeDirty(), then
39786	** an error might occur and the pager would end up in WRITER_LOCKED state
39787	** with pages marked as dirty in the cache.
39788	*/
39789	if( pPager->eState==PAGER_WRITER_LOCKED ){
39790	rc = pager_open_journal(pPager);
39791	if( rc!=SQLITE_OK ) return rc;
39792	}
39793	assert( pPager->eState>=PAGER_WRITER_CACHEMOD );
39794	assert( assert_pager_state(pPager) );
39795
39796	/* Mark the page as dirty. If the page has already been written
39797	** to the journal then we can return right away.
39798	*/
39799	sqlite3PcacheMakeDirty(pPg);
39800	if( pageInJournal(pPg) && !subjRequiresPage(pPg) ){
39801	assert( !pagerUseWal(pPager) );

39802	}else{















39803
39804	/* The transaction journal now exists and we have a RESERVED or an
39805	** EXCLUSIVE lock on the main database file. Write the current page to
39806	** the transaction journal if it is not there already.
39807	*/
	@@ -43589,11 +43599,11 @@
43599	** it sets pWal->hdr.mxFrame to 0. Otherwise, pWal->hdr.mxFrame is left
43600	** unchanged.
43601	**
43602	** SQLITE_OK is returned if no error is encountered (regardless of whether
43603	** or not pWal->hdr.mxFrame is modified). An SQLite error code is returned
43604	** if an error occurs.
43605	*/
43606	static int walRestartLog(Wal *pWal){
43607	int rc = SQLITE_OK;
43608	int cnt;
43609
	@@ -43622,10 +43632,12 @@
43632	walIndexWriteHdr(pWal);
43633	pInfo->nBackfill = 0;
43634	for(i=1; i<WAL_NREADER; i++) pInfo->aReadMark[i] = READMARK_NOT_USED;
43635	assert( pInfo->aReadMark[0]==0 );
43636	walUnlockExclusive(pWal, WAL_READ_LOCK(1), WAL_NREADER-1);
43637	}else if( rc!=SQLITE_BUSY ){
43638	return rc;
43639	}
43640	}
43641	walUnlockShared(pWal, WAL_READ_LOCK(0));
43642	pWal->readLock = -1;
43643	cnt = 0;
	@@ -54130,18 +54142,11 @@
54142	}else if( pMem->flags & MEM_Int ){
54143	return (double)pMem->u.i;
54144	}else if( pMem->flags & (MEM_Str\|MEM_Blob) ){
54145	/* (double)0 In case of SQLITE_OMIT_FLOATING_POINT... */
54146	double val = (double)0;
54147	sqlite3AtoF(pMem->z, &val, pMem->n, pMem->enc);







54148	return val;
54149	}else{
54150	/* (double)0 In case of SQLITE_OMIT_FLOATING_POINT... */
54151	return (double)0;
54152	}
	@@ -87647,11 +87652,10 @@
87652	addr2 = sqlite3VdbeAddOp0(v, OP_Goto);
87653	sqlite3VdbeJumpHere(v, addr1);
87654	sqlite3VdbeAddOp1(v, OP_Last, pOrderBy->iECursor);
87655	sqlite3VdbeAddOp1(v, OP_Delete, pOrderBy->iECursor);
87656	sqlite3VdbeJumpHere(v, addr2);

87657	}
87658	}
87659
87660	/*
87661	** Add code to implement the OFFSET
	@@ -87926,15 +87930,15 @@
87930	break;
87931	}
87932	#endif
87933	}
87934
87935	/* Jump to the end of the loop if the LIMIT is reached. Except, if
87936	** there is a sorter, in which case the sorter has already limited
87937	** the output for us.
87938	*/
87939	if( pOrderBy==0 && p->iLimit ){


87940	sqlite3VdbeAddOp3(v, OP_IfZero, p->iLimit, iBreak, -1);
87941	}
87942	}
87943
87944	/*
	@@ -88065,14 +88069,10 @@
88069	}
88070	}
88071	sqlite3ReleaseTempReg(pParse, regRow);
88072	sqlite3ReleaseTempReg(pParse, regRowid);
88073




88074	/* The bottom of the loop
88075	*/
88076	sqlite3VdbeResolveLabel(v, addrContinue);
88077	sqlite3VdbeAddOp2(v, OP_Next, iTab, addr);
88078	sqlite3VdbeResolveLabel(v, addrBreak);
	@@ -89386,11 +89386,10 @@
89386	}
89387
89388	/* Separate the left and the right query from one another
89389	*/
89390	p->pPrior = 0;

89391	sqlite3ResolveOrderGroupBy(pParse, p, p->pOrderBy, "ORDER");
89392	if( pPrior->pPrior==0 ){
89393	sqlite3ResolveOrderGroupBy(pParse, pPrior, pPrior->pOrderBy, "ORDER");
89394	}
89395
89396

M src/sqlite3.h

+1 -1

		--- src/sqlite3.h
		+++ src/sqlite3.h
		@@ -107,11 +107,11 @@
107	107	** [sqlite3_libversion_number()], [sqlite3_sourceid()],
108	108	** [sqlite_version()] and [sqlite_source_id()].
109	109	*/
110	110	#define SQLITE_VERSION "3.7.3"
111	111	#define SQLITE_VERSION_NUMBER 3007003
112		-#define SQLITE_SOURCE_ID "2010-10-04 23:55:51 ece641eb8951c6314cedbdb3243f91cb199c3239"
	112	+#define SQLITE_SOURCE_ID "2010-10-07 13:29:13 e55ada89246d4cc5f476891c70572dc7c1c3643e"
113	113
114	114	/*
115	115	** CAPI3REF: Run-Time Library Version Numbers
116	116	** KEYWORDS: sqlite3_version, sqlite3_sourceid
117	117	**
118	118

	--- src/sqlite3.h
	+++ src/sqlite3.h
	@@ -107,11 +107,11 @@
107	** [sqlite3_libversion_number()], [sqlite3_sourceid()],
108	** [sqlite_version()] and [sqlite_source_id()].
109	*/
110	#define SQLITE_VERSION "3.7.3"
111	#define SQLITE_VERSION_NUMBER 3007003
112	#define SQLITE_SOURCE_ID "2010-10-04 23:55:51 ece641eb8951c6314cedbdb3243f91cb199c3239"
113
114	/*
115	** CAPI3REF: Run-Time Library Version Numbers
116	** KEYWORDS: sqlite3_version, sqlite3_sourceid
117	**
118

	--- src/sqlite3.h
	+++ src/sqlite3.h
	@@ -107,11 +107,11 @@
107	** [sqlite3_libversion_number()], [sqlite3_sourceid()],
108	** [sqlite_version()] and [sqlite_source_id()].
109	*/
110	#define SQLITE_VERSION "3.7.3"
111	#define SQLITE_VERSION_NUMBER 3007003
112	#define SQLITE_SOURCE_ID "2010-10-07 13:29:13 e55ada89246d4cc5f476891c70572dc7c1c3643e"
113
114	/*
115	** CAPI3REF: Run-Time Library Version Numbers
116	** KEYWORDS: sqlite3_version, sqlite3_sourceid
117	**
118

M src/timeline.c

		--- src/timeline.c
		+++ src/timeline.c
		@@ -943,10 +943,13 @@
943	943	if( nEntry<200 ){
944	944	timeline_submenu(&url, "200 Entries", "n", "200", 0);
945	945	}
946	946	}
947	947	}
	948	+ if( P("showsql") ){
	949	+ @ <blockquote>%h(blob_str(&sql))</blockquote>
	950	+ }
948	951	blob_zero(&sql);
949	952	db_prepare(&q, "SELECT * FROM timeline ORDER BY timestamp DESC /scan/");
950	953	@ <h2>%b(&desc)</h2>
951	954	blob_reset(&desc);
952	955	www_print_timeline(&q, tmFlags, 0);
953	956

	--- src/timeline.c
	+++ src/timeline.c
	@@ -943,10 +943,13 @@
943	if( nEntry<200 ){
944	timeline_submenu(&url, "200 Entries", "n", "200", 0);
945	}
946	}
947	}



948	blob_zero(&sql);
949	db_prepare(&q, "SELECT * FROM timeline ORDER BY timestamp DESC /scan/");
950	@ <h2>%b(&desc)</h2>
951	blob_reset(&desc);
952	www_print_timeline(&q, tmFlags, 0);
953

	--- src/timeline.c
	+++ src/timeline.c
	@@ -943,10 +943,13 @@
943	if( nEntry<200 ){
944	timeline_submenu(&url, "200 Entries", "n", "200", 0);
945	}
946	}
947	}
948	if( P("showsql") ){
949	@ <blockquote>%h(blob_str(&sql))</blockquote>
950	}
951	blob_zero(&sql);
952	db_prepare(&q, "SELECT * FROM timeline ORDER BY timestamp DESC /scan/");
953	@ <h2>%b(&desc)</h2>
954	blob_reset(&desc);
955	www_print_timeline(&q, tmFlags, 0);
956

M win/Makefile.dmc

+11 -5

		--- win/Makefile.dmc
		+++ win/Makefile.dmc
		@@ -24,13 +24,13 @@
24	24	CFLAGS = -o
25	25	BCC = $(DMDIR)\bin\dmc $(CFLAGS)
26	26	TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(I18N) $(SSL) $(INCL)
27	27	LIBS = $(DMDIR)\extra\lib\ zlib wsock32
28	28
29		-SRC = add_.c allrepo_.c attach_.c bag_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c file_.c finfo_.c graph_.c http_.c http_socket_.c http_ssl_.c http_transport_.c info_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c stat_.c style_.c sync_.c tag_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c
	29	+SRC = add_.c allrepo_.c attach_.c bag_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c file_.c finfo_.c graph_.c http_.c http_socket_.c http_ssl_.c http_transport_.c info_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c stat_.c style_.c sync_.c tag_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c
30	30
31		-OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\graph$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\info$O $(OBJDIR)\login$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\name$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\zip$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
	31	+OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\event$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\graph$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\info$O $(OBJDIR)\login$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\name$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\zip$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
32	32
33	33	RC=$(DMDIR)\bin\rcc
34	34	RCFLAGS=-32 -w1 -I$(SRCDIR) /D__DMC__
35	35
36	36	APPNAME = $(OBJDIR)\fossil$(E)
		@@ -41,13 +41,13 @@
41	41	cd $(OBJDIR)
42	42	$(DMDIR)\bin\link @link
43	43
44	44	fossil.res: $B\win\fossil.rc
45	45	$(RC) $(RCFLAGS) -o$@ $**
46		-
	46	+
47	47	$(OBJDIR)\link: $B\win\Makefile.dmc
48		- +echo add allrepo attach bag blob branch browse captcha cgi checkin checkout clearsign clone comformat configure content db delta deltacmd descendants diff diffcmd doc encode file finfo graph http http_socket http_ssl http_transport info login main manifest md5 merge merge3 name pivot popen pqueue printf rebuild report rss schema search setup sha1 shun skins stat style sync tag th_main timeline tkt tktsetup undo update url user verify vfile wiki wikiformat winhttp xfer zip sqlite3 th th_lang > $@
	48	+ +echo add allrepo attach bag blob branch browse captcha cgi checkin checkout clearsign clone comformat configure content db delta deltacmd descendants diff diffcmd doc encode event file finfo graph http http_socket http_ssl http_transport info login main manifest md5 merge merge3 name pivot popen pqueue printf rebuild report rss schema search setup sha1 shun skins stat style sync tag th_main timeline tkt tktsetup undo update url user verify vfile wiki wikiformat winhttp xfer zip sqlite3 th th_lang > $@
49	49	+echo fossil >> $@
50	50	+echo fossil >> $@
51	51	+echo $(LIBS) >> $@
52	52	+echo. >> $@
53	53	+echo fossil >> $@
		@@ -230,10 +230,16 @@
230	230	$(OBJDIR)\encode$O : encode_.c encode.h
231	231	$(TCC) -o$@ -c encode_.c
232	232
233	233	encode_.c : $(SRCDIR)\encode.c
234	234	+translate$E $** > $@
	235	+
	236	+$(OBJDIR)\event$O : event_.c event.h
	237	+ $(TCC) -o$@ -c event_.c
	238	+
	239	+event_.c : $(SRCDIR)\event.c
	240	+ +translate$E $** > $@
235	241
236	242	$(OBJDIR)\file$O : file_.c file.h
237	243	$(TCC) -o$@ -c file_.c
238	244
239	245	file_.c : $(SRCDIR)\file.c
		@@ -514,7 +520,7 @@
514	520
515	521	zip_.c : $(SRCDIR)\zip.c
516	522	+translate$E $** > $@
517	523
518	524	headers: makeheaders$E page_index.h VERSION.h
519		- +makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h file_.c:file.h finfo_.c:finfo.h graph_.c:graph.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h info_.c:info.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h
	525	+ +makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h file_.c:file.h finfo_.c:finfo.h graph_.c:graph.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h info_.c:info.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h
520	526	@copy /Y nul: headers
521	527

	--- win/Makefile.dmc
	+++ win/Makefile.dmc
	@@ -24,13 +24,13 @@
24	CFLAGS = -o
25	BCC = $(DMDIR)\bin\dmc $(CFLAGS)
26	TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(I18N) $(SSL) $(INCL)
27	LIBS = $(DMDIR)\extra\lib\ zlib wsock32
28
29	SRC = add_.c allrepo_.c attach_.c bag_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c file_.c finfo_.c graph_.c http_.c http_socket_.c http_ssl_.c http_transport_.c info_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c stat_.c style_.c sync_.c tag_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c
30
31	OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\graph$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\info$O $(OBJDIR)\login$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\name$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\zip$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
32
33	RC=$(DMDIR)\bin\rcc
34	RCFLAGS=-32 -w1 -I$(SRCDIR) /D__DMC__
35
36	APPNAME = $(OBJDIR)\fossil$(E)
	@@ -41,13 +41,13 @@
41	cd $(OBJDIR)
42	$(DMDIR)\bin\link @link
43
44	fossil.res: $B\win\fossil.rc
45	$(RC) $(RCFLAGS) -o$@ $**
46
47	$(OBJDIR)\link: $B\win\Makefile.dmc
48	+echo add allrepo attach bag blob branch browse captcha cgi checkin checkout clearsign clone comformat configure content db delta deltacmd descendants diff diffcmd doc encode file finfo graph http http_socket http_ssl http_transport info login main manifest md5 merge merge3 name pivot popen pqueue printf rebuild report rss schema search setup sha1 shun skins stat style sync tag th_main timeline tkt tktsetup undo update url user verify vfile wiki wikiformat winhttp xfer zip sqlite3 th th_lang > $@
49	+echo fossil >> $@
50	+echo fossil >> $@
51	+echo $(LIBS) >> $@
52	+echo. >> $@
53	+echo fossil >> $@
	@@ -230,10 +230,16 @@
230	$(OBJDIR)\encode$O : encode_.c encode.h
231	$(TCC) -o$@ -c encode_.c
232
233	encode_.c : $(SRCDIR)\encode.c
234	+translate$E $** > $@






235
236	$(OBJDIR)\file$O : file_.c file.h
237	$(TCC) -o$@ -c file_.c
238
239	file_.c : $(SRCDIR)\file.c
	@@ -514,7 +520,7 @@
514
515	zip_.c : $(SRCDIR)\zip.c
516	+translate$E $** > $@
517
518	headers: makeheaders$E page_index.h VERSION.h
519	+makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h file_.c:file.h finfo_.c:finfo.h graph_.c:graph.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h info_.c:info.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h
520	@copy /Y nul: headers
521

	--- win/Makefile.dmc
	+++ win/Makefile.dmc
	@@ -24,13 +24,13 @@
24	CFLAGS = -o
25	BCC = $(DMDIR)\bin\dmc $(CFLAGS)
26	TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(I18N) $(SSL) $(INCL)
27	LIBS = $(DMDIR)\extra\lib\ zlib wsock32
28
29	SRC = add_.c allrepo_.c attach_.c bag_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c file_.c finfo_.c graph_.c http_.c http_socket_.c http_ssl_.c http_transport_.c info_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c stat_.c style_.c sync_.c tag_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c
30
31	OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\event$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\graph$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\info$O $(OBJDIR)\login$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\name$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\zip$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
32
33	RC=$(DMDIR)\bin\rcc
34	RCFLAGS=-32 -w1 -I$(SRCDIR) /D__DMC__
35
36	APPNAME = $(OBJDIR)\fossil$(E)
	@@ -41,13 +41,13 @@
41	cd $(OBJDIR)
42	$(DMDIR)\bin\link @link
43
44	fossil.res: $B\win\fossil.rc
45	$(RC) $(RCFLAGS) -o$@ $**
46
47	$(OBJDIR)\link: $B\win\Makefile.dmc
48	+echo add allrepo attach bag blob branch browse captcha cgi checkin checkout clearsign clone comformat configure content db delta deltacmd descendants diff diffcmd doc encode event file finfo graph http http_socket http_ssl http_transport info login main manifest md5 merge merge3 name pivot popen pqueue printf rebuild report rss schema search setup sha1 shun skins stat style sync tag th_main timeline tkt tktsetup undo update url user verify vfile wiki wikiformat winhttp xfer zip sqlite3 th th_lang > $@
49	+echo fossil >> $@
50	+echo fossil >> $@
51	+echo $(LIBS) >> $@
52	+echo. >> $@
53	+echo fossil >> $@
	@@ -230,10 +230,16 @@
230	$(OBJDIR)\encode$O : encode_.c encode.h
231	$(TCC) -o$@ -c encode_.c
232
233	encode_.c : $(SRCDIR)\encode.c
234	+translate$E $** > $@
235
236	$(OBJDIR)\event$O : event_.c event.h
237	$(TCC) -o$@ -c event_.c
238
239	event_.c : $(SRCDIR)\event.c
240	+translate$E $** > $@
241
242	$(OBJDIR)\file$O : file_.c file.h
243	$(TCC) -o$@ -c file_.c
244
245	file_.c : $(SRCDIR)\file.c
	@@ -514,7 +520,7 @@
520
521	zip_.c : $(SRCDIR)\zip.c
522	+translate$E $** > $@
523
524	headers: makeheaders$E page_index.h VERSION.h
525	+makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h file_.c:file.h finfo_.c:finfo.h graph_.c:graph.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h info_.c:info.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h
526	@copy /Y nul: headers
527

M win/Makefile.dmc

+11 -5

		--- win/Makefile.dmc
		+++ win/Makefile.dmc
		@@ -24,13 +24,13 @@
24	24	CFLAGS = -o
25	25	BCC = $(DMDIR)\bin\dmc $(CFLAGS)
26	26	TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(I18N) $(SSL) $(INCL)
27	27	LIBS = $(DMDIR)\extra\lib\ zlib wsock32
28	28
29		-SRC = add_.c allrepo_.c attach_.c bag_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c file_.c finfo_.c graph_.c http_.c http_socket_.c http_ssl_.c http_transport_.c info_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c stat_.c style_.c sync_.c tag_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c
	29	+SRC = add_.c allrepo_.c attach_.c bag_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c file_.c finfo_.c graph_.c http_.c http_socket_.c http_ssl_.c http_transport_.c info_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c stat_.c style_.c sync_.c tag_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c
30	30
31		-OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\graph$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\info$O $(OBJDIR)\login$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\name$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\zip$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
	31	+OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\event$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\graph$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\info$O $(OBJDIR)\login$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\name$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\zip$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
32	32
33	33	RC=$(DMDIR)\bin\rcc
34	34	RCFLAGS=-32 -w1 -I$(SRCDIR) /D__DMC__
35	35
36	36	APPNAME = $(OBJDIR)\fossil$(E)
		@@ -41,13 +41,13 @@
41	41	cd $(OBJDIR)
42	42	$(DMDIR)\bin\link @link
43	43
44	44	fossil.res: $B\win\fossil.rc
45	45	$(RC) $(RCFLAGS) -o$@ $**
46		-
	46	+
47	47	$(OBJDIR)\link: $B\win\Makefile.dmc
48		- +echo add allrepo attach bag blob branch browse captcha cgi checkin checkout clearsign clone comformat configure content db delta deltacmd descendants diff diffcmd doc encode file finfo graph http http_socket http_ssl http_transport info login main manifest md5 merge merge3 name pivot popen pqueue printf rebuild report rss schema search setup sha1 shun skins stat style sync tag th_main timeline tkt tktsetup undo update url user verify vfile wiki wikiformat winhttp xfer zip sqlite3 th th_lang > $@
	48	+ +echo add allrepo attach bag blob branch browse captcha cgi checkin checkout clearsign clone comformat configure content db delta deltacmd descendants diff diffcmd doc encode event file finfo graph http http_socket http_ssl http_transport info login main manifest md5 merge merge3 name pivot popen pqueue printf rebuild report rss schema search setup sha1 shun skins stat style sync tag th_main timeline tkt tktsetup undo update url user verify vfile wiki wikiformat winhttp xfer zip sqlite3 th th_lang > $@
49	49	+echo fossil >> $@
50	50	+echo fossil >> $@
51	51	+echo $(LIBS) >> $@
52	52	+echo. >> $@
53	53	+echo fossil >> $@
		@@ -230,10 +230,16 @@
230	230	$(OBJDIR)\encode$O : encode_.c encode.h
231	231	$(TCC) -o$@ -c encode_.c
232	232
233	233	encode_.c : $(SRCDIR)\encode.c
234	234	+translate$E $** > $@
	235	+
	236	+$(OBJDIR)\event$O : event_.c event.h
	237	+ $(TCC) -o$@ -c event_.c
	238	+
	239	+event_.c : $(SRCDIR)\event.c
	240	+ +translate$E $** > $@
235	241
236	242	$(OBJDIR)\file$O : file_.c file.h
237	243	$(TCC) -o$@ -c file_.c
238	244
239	245	file_.c : $(SRCDIR)\file.c
		@@ -514,7 +520,7 @@
514	520
515	521	zip_.c : $(SRCDIR)\zip.c
516	522	+translate$E $** > $@
517	523
518	524	headers: makeheaders$E page_index.h VERSION.h
519		- +makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h file_.c:file.h finfo_.c:finfo.h graph_.c:graph.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h info_.c:info.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h
	525	+ +makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h file_.c:file.h finfo_.c:finfo.h graph_.c:graph.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h info_.c:info.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h
520	526	@copy /Y nul: headers
521	527

	--- win/Makefile.dmc
	+++ win/Makefile.dmc
	@@ -24,13 +24,13 @@
24	CFLAGS = -o
25	BCC = $(DMDIR)\bin\dmc $(CFLAGS)
26	TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(I18N) $(SSL) $(INCL)
27	LIBS = $(DMDIR)\extra\lib\ zlib wsock32
28
29	SRC = add_.c allrepo_.c attach_.c bag_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c file_.c finfo_.c graph_.c http_.c http_socket_.c http_ssl_.c http_transport_.c info_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c stat_.c style_.c sync_.c tag_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c
30
31	OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\graph$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\info$O $(OBJDIR)\login$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\name$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\zip$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
32
33	RC=$(DMDIR)\bin\rcc
34	RCFLAGS=-32 -w1 -I$(SRCDIR) /D__DMC__
35
36	APPNAME = $(OBJDIR)\fossil$(E)
	@@ -41,13 +41,13 @@
41	cd $(OBJDIR)
42	$(DMDIR)\bin\link @link
43
44	fossil.res: $B\win\fossil.rc
45	$(RC) $(RCFLAGS) -o$@ $**
46
47	$(OBJDIR)\link: $B\win\Makefile.dmc
48	+echo add allrepo attach bag blob branch browse captcha cgi checkin checkout clearsign clone comformat configure content db delta deltacmd descendants diff diffcmd doc encode file finfo graph http http_socket http_ssl http_transport info login main manifest md5 merge merge3 name pivot popen pqueue printf rebuild report rss schema search setup sha1 shun skins stat style sync tag th_main timeline tkt tktsetup undo update url user verify vfile wiki wikiformat winhttp xfer zip sqlite3 th th_lang > $@
49	+echo fossil >> $@
50	+echo fossil >> $@
51	+echo $(LIBS) >> $@
52	+echo. >> $@
53	+echo fossil >> $@
	@@ -230,10 +230,16 @@
230	$(OBJDIR)\encode$O : encode_.c encode.h
231	$(TCC) -o$@ -c encode_.c
232
233	encode_.c : $(SRCDIR)\encode.c
234	+translate$E $** > $@






235
236	$(OBJDIR)\file$O : file_.c file.h
237	$(TCC) -o$@ -c file_.c
238
239	file_.c : $(SRCDIR)\file.c
	@@ -514,7 +520,7 @@
514
515	zip_.c : $(SRCDIR)\zip.c
516	+translate$E $** > $@
517
518	headers: makeheaders$E page_index.h VERSION.h
519	+makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h file_.c:file.h finfo_.c:finfo.h graph_.c:graph.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h info_.c:info.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h
520	@copy /Y nul: headers
521

	--- win/Makefile.dmc
	+++ win/Makefile.dmc
	@@ -24,13 +24,13 @@
24	CFLAGS = -o
25	BCC = $(DMDIR)\bin\dmc $(CFLAGS)
26	TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(I18N) $(SSL) $(INCL)
27	LIBS = $(DMDIR)\extra\lib\ zlib wsock32
28
29	SRC = add_.c allrepo_.c attach_.c bag_.c blob_.c branch_.c browse_.c captcha_.c cgi_.c checkin_.c checkout_.c clearsign_.c clone_.c comformat_.c configure_.c content_.c db_.c delta_.c deltacmd_.c descendants_.c diff_.c diffcmd_.c doc_.c encode_.c event_.c file_.c finfo_.c graph_.c http_.c http_socket_.c http_ssl_.c http_transport_.c info_.c login_.c main_.c manifest_.c md5_.c merge_.c merge3_.c name_.c pivot_.c popen_.c pqueue_.c printf_.c rebuild_.c report_.c rss_.c schema_.c search_.c setup_.c sha1_.c shun_.c skins_.c stat_.c style_.c sync_.c tag_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c update_.c url_.c user_.c verify_.c vfile_.c wiki_.c wikiformat_.c winhttp_.c xfer_.c zip_.c
30
31	OBJ = $(OBJDIR)\add$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\bag$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\event$O $(OBJDIR)\file$O $(OBJDIR)\finfo$O $(OBJDIR)\graph$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\info$O $(OBJDIR)\login$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\name$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\rebuild$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\setup$O $(OBJDIR)\sha1$O $(OBJDIR)\shun$O $(OBJDIR)\skins$O $(OBJDIR)\stat$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\zip$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O
32
33	RC=$(DMDIR)\bin\rcc
34	RCFLAGS=-32 -w1 -I$(SRCDIR) /D__DMC__
35
36	APPNAME = $(OBJDIR)\fossil$(E)
	@@ -41,13 +41,13 @@
41	cd $(OBJDIR)
42	$(DMDIR)\bin\link @link
43
44	fossil.res: $B\win\fossil.rc
45	$(RC) $(RCFLAGS) -o$@ $**
46
47	$(OBJDIR)\link: $B\win\Makefile.dmc
48	+echo add allrepo attach bag blob branch browse captcha cgi checkin checkout clearsign clone comformat configure content db delta deltacmd descendants diff diffcmd doc encode event file finfo graph http http_socket http_ssl http_transport info login main manifest md5 merge merge3 name pivot popen pqueue printf rebuild report rss schema search setup sha1 shun skins stat style sync tag th_main timeline tkt tktsetup undo update url user verify vfile wiki wikiformat winhttp xfer zip sqlite3 th th_lang > $@
49	+echo fossil >> $@
50	+echo fossil >> $@
51	+echo $(LIBS) >> $@
52	+echo. >> $@
53	+echo fossil >> $@
	@@ -230,10 +230,16 @@
230	$(OBJDIR)\encode$O : encode_.c encode.h
231	$(TCC) -o$@ -c encode_.c
232
233	encode_.c : $(SRCDIR)\encode.c
234	+translate$E $** > $@
235
236	$(OBJDIR)\event$O : event_.c event.h
237	$(TCC) -o$@ -c event_.c
238
239	event_.c : $(SRCDIR)\event.c
240	+translate$E $** > $@
241
242	$(OBJDIR)\file$O : file_.c file.h
243	$(TCC) -o$@ -c file_.c
244
245	file_.c : $(SRCDIR)\file.c
	@@ -514,7 +520,7 @@
520
521	zip_.c : $(SRCDIR)\zip.c
522	+translate$E $** > $@
523
524	headers: makeheaders$E page_index.h VERSION.h
525	+makeheaders$E add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h event_.c:event.h file_.c:file.h finfo_.c:finfo.h graph_.c:graph.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h info_.c:info.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)\sqlite3.h $(SRCDIR)\th.h VERSION.h
526	@copy /Y nul: headers
527

Fossil SCM

Keyboard Shortcuts