Skip to content

Commit 4f7bdda

Browse files
committed
update for releases using git instead of svn
1 parent 4f73b44 commit 4f7bdda

File tree

2 files changed

+26
-85
lines changed

2 files changed

+26
-85
lines changed

MAKEPKGS.BAT

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ IF "%1"=="" GOTO USAGE
33
REM assumes ran in same directory as this file, ie base of kernel source
44
SET BASEPATH=%CD%
55
CD ..
6+
REM when called from RELEASE.BAT assume clean source exported from version control
7+
IF "%2"=="RELEASE" GOTO PACK
68

79
ECHO create source copy
810
if EXIST SOURCE RMDIR /S /Q SOURCE > NUL
@@ -18,18 +20,20 @@ PUSHD .
1820
CD SOURCE\ke%1
1921
CALL clobber.bat
2022
POPD
21-
PAUSE
2223

24+
:PACK
2325
SET VERSION=%1
2426
SET LSMRET=SRC
2527
SET LSMFILE=SOURCE\ke%1\docs\fdkernel.lsm
2628
GOTO LSM
2729
:SRC
30+
REM remove CONFIG.BAT if exists, such as building packages from develoment directory
31+
IF EXIST SOURCE\ke%1\CONFIG.BAT DEL SOURCE\ke%1\CONFIG.BAT > NUL
2832
ECHO zipping source
2933
7z.exe a -tzip -mx9 -mpass15 -r ke%1s.zip SOURCE\*
3034
ECHO creating APPINFO and expected packaging dir structure
3135
ECHO using working configuration file
32-
::COPY trunk\CONFIG.BAT SOURCE\ke%1 > NUL
36+
COPY %BASEPATH%\CONFIG.BAT SOURCE\ke%1\ > NUL
3337
CD SOURCE\ke%1
3438

3539
ECHO build and packaging
@@ -97,7 +101,7 @@ SET VERSION=
97101
GOTO %LSMRET%
98102

99103
:USAGE
100-
ECHO Build kernel packages (interim builds or release without tagging) - usage: %0 {VERSION} e.g. %0 2039
104+
ECHO Build kernel packages (interim builds or release without tagging) - usage: %0 {VERSION} e.g. %0 2039 or %0 git
101105
:DONE
102106
CD %BASEPATH%
103107
SET BASEPATH=

RELEASE.BAT

Lines changed: 19 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -1,92 +1,29 @@
11
@ECHO OFF
22
IF "%1"=="" GOTO USAGE
3-
REM goto to just below trunk and tags directory, assume ran in trunk directory
4-
CD ..
3+
REM assume ran in root directory of kernel checkout, e.g. C:\fdos\source\kernel\
54

6-
ECHO tag SVN with release version - svn copy trunk/ tags/ke%1
7-
svn copy https://freedos.svn.sourceforge.net/svnroot/freedos/kernel/trunk/ https://freedos.svn.sourceforge.net/svnroot/freedos/kernel/tags/ke%1 -m "Tag kernel release %1"
8-
PAUSE
9-
ECHO svn export to get clean tree
10-
if EXIST SOURCE RMDIR /S /Q SOURCE > NUL
11-
svn export https://freedos.svn.sourceforge.net/svnroot/freedos/kernel/tags/ke%1 SOURCE\ke%1
12-
REM svn export https://freedos.svn.sourceforge.net/svnroot/freedos/kernel/trunk SOURCE\ke%1
5+
ECHO tag git with release version -
6+
git tag -a -m "Tag kernel release %1" ke%1 HEAD
7+
ECHO get a clean tree
8+
if EXIST ..\SOURCE RMDIR /S /Q ..\SOURCE > NUL
9+
git clone -v --local --branch ke%1 . ..\SOURCE\ke%1\
10+
::git clone -v --local . ..\SOURCE\ke%1\
1311

14-
SET VERSION=%1
15-
SET LSMRET=SRC
16-
SET LSMFILE=SOURCE\ke%1\docs\fdkernel.lsm
17-
GOTO LSM
18-
:SRC
19-
ECHO zipping source
20-
7z.exe a -tzip -mx9 -mpass15 -r ke%1s.zip SOURCE\*
21-
ECHO creating APPINFO and expected packaging dir structure
22-
ECHO using working configuration file
23-
COPY trunk\CONFIG.BAT SOURCE\ke%1 > NUL
24-
CD SOURCE\ke%1
12+
REM delete files to exclude
13+
RD /S /Q ..\SOURCE\ke%1\.git > NUL
14+
RD /S /Q ..\SOURCE\ke%1\.github > NUL
15+
DEL /Q ..\SOURCE\ke%1\.git* > NUL
16+
DEL /Q ..\SOURCE\ke%1\*.yml > NUL
17+
DEL /Q ..\SOURCE\ke%1\ci*.sh > NUL
18+
DEL /Q ..\SOURCE\ke%1\docs\*.yml > NUL
19+
DEL /Q ..\SOURCE\ke%1\docs\CNAME > NUL
20+
pause
2521

26-
ECHO build and packaging
27-
SET VERSION=%1 (FAT12/FAT16)
28-
SET FAT=16
29-
SET BZKRET=F16
30-
GOTO BZK
31-
:F16
32-
SET VERSION=%1 (FAT12/FAT16/FAT32)
33-
SET FAT=32
34-
SET BZKRET=F32
35-
GOTO BZK
36-
:F32
37-
ECHO clean up
38-
CD ..\..
39-
RMDIR /S /Q SOURCE > NUL
40-
ECHO Done.
41-
SET BZKRET=
22+
ECHO %CD%
23+
CALL MAKEPKGS.BAT %1 RELEASE
4224
GOTO DONE
4325

44-
45-
:BZK
46-
ECHO build kernel %VERSION%
47-
CALL build.bat /D KERNEL_VERSION /V "%1 " 86 upx fat%FAT%
48-
DEL BIN\K??86??.sys
49-
SET LSMRET=BZK_2
50-
SET LSMFILE=docs\fdkernel.lsm
51-
GOTO LSM
52-
:BZK_2
53-
SET LSMRET=
54-
ECHO zipping FAT%FAT% release version
55-
7z.exe a -tzip -mx9 -mpass15 -r ..\..\ke%1_86f%FAT%.zip BIN\* DOCS\*
56-
ECHO restructuring and zipping update package
57-
DEL BIN\K??86??.* > NUL
58-
MKDIR DOC
59-
MKDIR DOC\KERNEL
60-
COPY DOCS\* DOC\KERNEL\
61-
MKDIR APPINFO
62-
MOVE DOC\KERNEL\*.lsm APPINFO\
63-
7z.exe a -tzip -mx9 -mpass15 -r ..\..\kernel%FAT%.zip APPINFO\* BIN\* DOC\*
64-
ECHO cleaning up between builds
65-
CALL clobber.bat
66-
RMDIR /S /Q DOC
67-
RMDIR /S /Q APPINFO
68-
GOTO %BZKRET%
69-
70-
:LSM
71-
ECHO Begin3>%LSMFILE%
72-
ECHO Title: The FreeDOS Kernel>>%LSMFILE%
73-
ECHO Version: %VERSION%>>%LSMFILE%
74-
ECHO Entered-date: %DATE%>>%LSMFILE%
75-
ECHO Description: The FreeDOS Kernel>>%LSMFILE%
76-
ECHO Keywords: kernel, FreeDOS, DOS, MSDOS>>%LSMFILE%
77-
ECHO Author: (developers: can be reached on the freedos-kernel mailing list)>>%LSMFILE%
78-
ECHO Maintained-by: [email protected]>>%LSMFILE%
79-
ECHO Primary-site: http://freedos.sourceforge.net/kernel/>>%LSMFILE%
80-
ECHO Alternate-site: http://www.fdos.org/kernel/>>%LSMFILE%
81-
ECHO Alternate-site: https://freedos.svn.sourceforge.net/svnroot/freedos>>%LSMFILE%
82-
ECHO Original-site: http://www.gcfl.net/pub/FreeDOS/kernel>>%LSMFILE%
83-
ECHO Platforms: DOS, FreeDOS, DOSEMU (OpenWatcom C or Turbo C, NASM, UPX)>>%LSMFILE%
84-
ECHO Copying-policy: GPL2>>%LSMFILE%
85-
ECHO End>>%LSMFILE%
86-
SET LSMFILE=
87-
SET VERSION=
88-
GOTO %LSMRET%
89-
9026
:USAGE
9127
ECHO Tag and build release kernels - usage: RELEASE {VERSION} e.g. RELEASE 2039
9228
:DONE
29+
ECHO Please git push the tag to origin and upload the archives.

0 commit comments

Comments
 (0)