Skip to content

Commit

Permalink
Some NSIS script additions and developer doc updates.
Browse files Browse the repository at this point in the history
  • Loading branch information
vruppert committed Mar 24, 2024
1 parent b9c0cb6 commit 78c5b21
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 16 deletions.
5 changes: 4 additions & 1 deletion bochs/build/win32/nsis/bochs.nsi.in
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
;
; Based on Example Script by Joost Verburg
; also original BOCHS script by Robert (segra)
; updated for NSIS 3.04 by Volker Ruppert
; updated for NSIS 3.09 by Volker Ruppert
; version check and reinstall page based on NSIS example
;
;---------------------
Expand Down Expand Up @@ -61,6 +61,8 @@ Var IndependentSectionState
Name "${NAME}"
OutFile Bochs-win${BITS}-${VERSION}.exe
SetOverwrite on
Unicode True
XPStyle On

; Installation Types
InstType "Normal"
Expand Down Expand Up @@ -270,6 +272,7 @@ Section -post
SetRegView ${BITS}
; Register Uninstaller
WriteRegStr HKLM "Software\Bochs" "" $INSTDIR
WriteRegStr HKLM "Software\Bochs" "BX_SHARE_PATH" $INSTDIR
WriteRegDword HKLM "Software\Bochs" "VersionMajor" "${VER_MAJOR}"
WriteRegDword HKLM "Software\Bochs" "VersionMinor" "${VER_MINOR}"
WriteRegDword HKLM "Software\Bochs" "VersionRevision" "${VER_REVISION}"
Expand Down
41 changes: 27 additions & 14 deletions bochs/doc/docbook/development/development.dbk
Original file line number Diff line number Diff line change
Expand Up @@ -3394,11 +3394,26 @@ number for the Windows build.
</screen>
</para>
<para>
Check date, update/sumup info in CHANGES. Run autoconf to regenerate configure and check them in.
Create an GIT tag that contains all files of the revision that was used in the release.
Check date, update/sumup info in CHANGES. Run autoconf to regenerate configure and
check them in. The next step is to create a GIT tag that contains all files of the
revision that was used in the release. Go to the main page of the Bochs repository
on <ulink url="https://github.com/bochs-emu/Bochs/">GitHub</ulink>. To the right
of the list of files, click on the <command>Releases</command> link. These are
the next steps:
<itemizedlist>
<listitem><para>Click on <command>Draft a new release</command></para></listitem>
<listitem><para>Click on <command>Choose a tag</command> and create a new one called
<filename>REL_2_8_FINAL</filename></para></listitem>
<listitem><para>Fill in the release title <filename>Bochs 2.8</filename></para></listitem>
<listitem><para>Use the top of the CHANGES file (brief summary of changes) as the description
</para></listitem>
<listitem><para>Select <command>Set as latest release</command></para></listitem>
<listitem><para>Finally click on <command>Publish release</command></para></listitem>
</itemizedlist>
</para>
<para>
&FIXME; This section needs an update because of the transition to GitHub
Source packages are automatically created (see below). After building the binary packages
you can edit the release and add them with drag&amp;drop.
</para>
</section>

Expand Down Expand Up @@ -3429,7 +3444,7 @@ root directory if it is not already present there.
<screen>
./build/redhat/make-rpm | tee ../build.txt
</screen>
This produces two rpm files in the current directory. Test and upload.
This produces two rpm files in the current directory. Test and upload (see below).
</para>
</section>

Expand All @@ -3452,7 +3467,7 @@ if necessary.
<para>
Open up Visual C++ and load the workspace file Bochs.sln. Check
the Build:Set Active Project Configuration is set the way you want it.
For releases I use "Win64 Release".
For releases I use "x64 Release".
</para>
<para>
To create "bochsdbg.exe" with Bochs debugger support, manually change these
Expand Down Expand Up @@ -3488,12 +3503,12 @@ Bochs website, copies all the files into <emphasis>./build/win32/nsis/bochs-2.8<
and then creates a binary ZIP file in the NSIS folder.
</para>
<para>
Now make the NSIS installer package (the current script is known to work with NSIS 3.04)
Now make the NSIS installer package (the current script is known to work with NSIS 3.09)
<screen>
cd build/win32/nsis
make
</screen>
That gives an installer called <filename>Bochs-2.8.exe</filename>. Test and upload it.
That gives an installer called <filename>Bochs-win64-2.8.exe</filename>. Test and upload it.
</para>
</section>

Expand Down Expand Up @@ -3524,9 +3539,8 @@ News" section on SF.
The Bochs project webspace is stored under the SF directory <filename>/home/project-web/bochs</filename>.
It can be accessed from the SF shell using SSH or with the commands <command>sftp</command>,
<command>scp</command> and <command>rsync</command>. Some parts of the directory
structure must be updated from the local CVS repository, others from Bochs SVN
(directories <filename>bochs</filename> and <filename>sfsite</filename>).
The online documentation, disk images and screenshots must be uploaded manually.
structure must be updated from the local CVS repository, others from <filename>Bochs-sfsite</filename>
GIT repository. The online documentation, disk images and screenshots must be uploaded manually.
<table>
<title>Directory structure</title>
<tgroup cols="2">
Expand All @@ -3539,17 +3553,16 @@ The online documentation, disk images and screenshots must be uploaded manually.
<tbody>
<row><entry>cgi-bin</entry><entry>CGI scripts for the website</entry></row>
<row><entry>htdocs</entry><entry>root directory of the website</entry></row>
<row><entry>htdocs/awards</entry><entry>TODO</entry></row>
<row><entry>htdocs/doc/docbook</entry><entry>Bochs online documentation</entry></row>
<row><entry>htdocs/docs-html</entry><entry>old Bochs documentation</entry></row>
<row><entry>htdocs/guestos</entry><entry>disk images directly stored on the Bochs website</entry></row>
<row><entry>htdocs/images</entry><entry>images for Bochs website</entry></row>
<row><entry>htdocs/includes</entry><entry>include files for Bochs website</entry></row>
<row><entry>htdocs/screenshot</entry><entry>screenshots of Bochs running several guest operating systems</entry></row>
<row><entry>htdocs/svn-snapshot</entry><entry>link to current snapshot</entry></row>
<row><entry>htdocs/techspec</entry><entry>technical specifications of several hardware components</entry></row>
<row><entry>lxr</entry><entry>Bochs source browser</entry></row>
<row><entry>sfsite-cvsroot</entry><entry>local CVS repository</entry></row>
<row><entry>sitebin</entry><entry>shell scripts (e.g. for snapshot generation)</entry></row>
<row><entry>siteman</entry><entry>website manual pages</entry></row>
<row><entry>snapshot</entry><entry>SVN snapshot storage area</entry></row>
<row><entry>tmp</entry><entry>temp directory for shell scripts</entry></row>
</tbody>
</tgroup>
Expand Down
6 changes: 5 additions & 1 deletion bochs/doc/docbook/user/user.dbk
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,8 @@ active project of the week at SourceForge.
regular basis, but a few statistics give an indication. The &devlist;,
which is the primary source of news on bugs and releases, has over 400
subscribers. The latest version has been downloaded over 150,000 times
from SourceForge, not counting any mirror website or SVN users.
from SourceForge, not counting any mirror website or
<ulink url="https://github.com/bochs-emu/Bochs/">GitHub</ulink> users.
</para>

<para>
Expand Down Expand Up @@ -969,6 +970,9 @@ See the <link linkend="get-src-svn">SVN instructions</link> for details.

<section id="get-src-svn"><title>Tracking the source code with SVN</title>
<para>
&FIXME; These sections need updates because of the transition to GitHub
</para>
<para>
SVN (Subversion) is a tool used by many software developers to manage changes
within their source code tree. SVN provides the means to store not only the
current version of a piece of source code, but a record of all changes (and who
Expand Down

0 comments on commit 78c5b21

Please sign in to comment.