reorg. preparing for next release

This commit is contained in:
Michael H.G. Schmidt 2022-06-19 11:28:23 +02:00
parent 872b235636
commit c825355cc1
8 changed files with 14 additions and 7 deletions

1
.gitignore vendored
View File

@ -10,4 +10,5 @@ distribution
SOFTWAREBKP
tmp/
personal/
company/

View File

@ -108,7 +108,7 @@ if EXIST software (
/XF *.iso /XF *.txt /XF *.cmd /XF *.csv /XF .gitignore /XD .git
)
for %%P in (drivers scripts source optional personal) do (
for %%P in (drivers scripts source optional personal company) do (
if EXIST %%P (
echo.
echo copying folder [ %%P ] to %USBDRIVE%\tools ...

View File

@ -312,6 +312,10 @@ FTP_PASS=mypass
The folder "personal" is also used by some other scripts in this project. You can place config files or license files in this folder (This will be described in detail in some other chapters). It may be a good idea to have this folder ("personal") as GIT repository on github or somewhere else - just my 50 cents.
There is also a folder "company" which can be used for license files and special binaries. I'm also recommending to create a git repository that will be checked out by you just before creating the target media.
Both folders must be created before calling the script that copies all files to the stick. Both folders will be copied then to the target machine when installing it via the USB stick...
Please notice: In the example i have chosen the path "... w10install/W1020H2v1". Best practice would be to have a folder for each Windows version (W1020H2v1). All files (including the iso file) should be put there - this makes sure that you have everything in one place for the case that you come back a year later or so and you want to create a new USB stick with a older Windows version - for testing purposes.

View File

@ -7,7 +7,7 @@ set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"
rem licensed version (exe contains key!)
rem access only for customers ...
set EXE=..\personal\purebasic-setup.exe
set EXE=..\company\purebasic-setup.exe
rem demo version (publically accessible)
set ZIP=..\software\purebasic.zip
@ -16,6 +16,7 @@ echo killing PureBasic processes...
taskkill /F /IM PureBasic.exe 2>nul
taskkill /F /IM pbcompiler.exe 2>nul
rem YES - this works. It is a "AND" construct...
if NOT EXIST %EXE% if NOT EXIST %ZIP% (
echo WARNING: no PureBasic zipfile or exe-installer found!
goto END

View File

@ -3,7 +3,7 @@
set OPT=..\optional
set SOFTWARE=..\software
set MSI=softmaker-setup.msi
set SETTINGS=..\personal\settings.cmd
set SETTINGS=..\company\settings.cmd
set softmaker_license=0
set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"

View File

@ -1,7 +1,7 @@
@echo off
set EXE=..\software\totalcommander-setup.exe
set KEY=..\personal\wincmd.key
set KEY=..\comany\wincmd.key
set TARGET=c:\totalcmd
set STARTMENU=%PROGRAMDATA%\"Microsoft\Windows\Start Menu\Programs"
set STARTMENU_USER=%APPDATA%\"Microsoft\Windows\Start Menu\Programs"

View File

@ -2,7 +2,7 @@
set TOOLS=c:\tools
set SOFTWARE=..\software
set PERSONAL=..\personal
set COMPANY=..\company
echo ####### %0 #######
@ -28,9 +28,10 @@ for %%E in (
rem copy licensed snapshot64 executable
rem (license is written to the binary)
if EXIST %PERSONAL%\snapshot64.exe (
if EXIST %COMPANY%\snapshot64.exe (
echo installing licensed version of snapshot64 ...
copy /Y %PERSONAL%\snapshot64.exe %TOOLS%
copy /Y %COMPANY%\snapshot64.exe %TOOLS%
)
echo ####### %0 #######