Mercurial Mercurial > hg > stx-libtool / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bmake.bat
author Jan Vrany <jan.vrany@fit.cvut.cz>
Mon, 16 Nov 2015 13:33:19 +0000
branchjv
changeset 15950 23be8cf85415
parent 15879 9a11c602ebcf
child 16408 bc62fb9a8df6
permissions -rw-r--r--
Bugfix in merge tool. Due to a bug, even an unmerged code has been treated as merged and wrong .st file has been written (with <conflict> lines. This commit should fix this problem.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
8921
e1d9aa2c8a55 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8827
diff changeset 
     1
 
@REM -------
12367
d21fa70e03ab automatically generated by browser
Claus Gittinger <cg@exept.de>
parents: 10931
diff changeset 
     2
 
@REM make using Borland bcc32
8921
e1d9aa2c8a55 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8827
diff changeset 
     3
 
@REM type bmake, and wait...
e1d9aa2c8a55 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8827
diff changeset 
     4
 
@REM do not edit - automatically generated from ProjectDefinition
e1d9aa2c8a55 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8827
diff changeset 
     5
 
@REM -------
13893
9fc52eb68804 merged in jv's changes
Claus Gittinger <cg@exept.de>
parents: 12367
diff changeset 
     6
 
@SET DEFINES=
15950
23be8cf85415 Bugfix in merge tool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 15879
diff changeset 
     7
 
@REM Kludge got Mercurial, cannot be implemented in Borland make
23be8cf85415 Bugfix in merge tool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 15879
diff changeset 
     8
 
@FOR /F "tokens=*" %%i in ('hg root') do SET HGROOT=%%i
23be8cf85415 Bugfix in merge tool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 15879
diff changeset 
     9
 
@IF "%HGROOT%" NEQ "" SET DEFINES=%DEFINES% "-DHGROOT=%HGROOT%"
15866
260d6e142cf3 new inspector tab for strings
Claus Gittinger <cg@exept.de>
parents: 15372
diff changeset 
    10
 







13893






9fc52eb68804
merged in jv's changes



Claus Gittinger <cg@exept.de>


parents: 
12367

diff
changeset




    11


make.exe -N -f bc.mak  %DEFINES% %*








15062






de377728f0b0
memoryusageview now compiled in



Claus Gittinger <cg@exept.de>


parents: 
15055

diff
changeset




    12














de377728f0b0
memoryusageview now compiled in



Claus Gittinger <cg@exept.de>


parents: 
15055

diff
changeset




    13
















hg/stx-libtool