Removed the need for an autoBuild branch

This commit is contained in:
Gator96100 2018-01-18 20:10:19 +01:00
parent 9c2ccd0671
commit c164ab44ff
11 changed files with 223 additions and 4 deletions

View file

@ -2,9 +2,9 @@
####################################### #######################################
Proxmark III Develoment Kit for Windows Proxmark III Develoment Kit for Windows
####################################### #######################################
## Different branches ## ## Different runme ##
The master branch is designed for development, when 'runme.bat' is started a terminal opens that allows to run make. The runme.bat is designed for development, when 'runme.bat' is started a terminal opens that allows to run make.
The autoBuild branch runs a script (msys/scrip.sh) at startup that updates all git repositories in the pm3 folder and then wants to compile them, it was not designed for development, just for compiling. The runme_autobuild.bat runs a script (msys/scrip.sh) at startup that updates all git repositories in the pm3 folder and then wants to compile them, it was not designed for development, just for compiling.
## What's installed ## ## What's installed ##

View file

@ -0,0 +1,75 @@
@echo off
color 0a
MODE CON COLS=80 LINES=36
title Bootrom FLASH FILE
echo.
echo.
echo.
echo =============================================================================
echo ©¦!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! O__O !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!©¦
echo ©¦=========================================================================©¦
echo ©¦Bootrom-ONLY FLASHER BATCH FILE ©¦
echo ©¦ ©¦
echo ©¦you will need to have this file (FLASH - Bootrom.bat) in \win32 folder ©¦
echo ©¦you will need to have flasher.exe in \win32 folder ©¦
echo ©¦you will need to have bootrom.elf in \firmware_win\bootrom folder ©¦
echo ©¦ ©¦
echo ©¦ ©¦
echo ©¦ ! FLASHING BOOTROM CAN BE EXTREMELY DANGEROUS ! ©¦
echo ©¦ ! FLASHING BOOTROM CAN BE EXTREMELY DANGEROUS ! ©¦
echo ©¦ ! FLASHING BOOTROM CAN BE EXTREMELY DANGEROUS ! ©¦
echo ©¦ ! FLASHING BOOTROM CAN BE EXTREMELY DANGEROUS ! ©¦
echo ©¦ ! FLASHING BOOTROM CAN BE EXTREMELY DANGEROUS ! ©¦
echo ©¦ ! FLASHING BOOTROM CAN BE EXTREMELY DANGEROUS ! ©¦
echo ©¦ ! FLASHING BOOTROM CAN BE EXTREMELY DANGEROUS ! ©¦
echo ©¦ ! FLASHING BOOTROM CAN BE EXTREMELY DANGEROUS ! ©¦
echo ©¦ ! FLASHING BOOTROM CAN BE EXTREMELY DANGEROUS ! ©¦
echo ©¦ ! FLASHING BOOTROM CAN BE EXTREMELY DANGEROUS ! ©¦
echo ©¦ ! FLASHING BOOTROM CAN BE EXTREMELY DANGEROUS ! ©¦
echo ©¦ ©¦
echo ©¦ ©¦
echo ©¦IF YOU HAVE THOSE REQUISITES ©¦
echo ©¦ HIT ANY BUTTON TO CONTINUE AT YOUR OWN RISK !!! ©¦
echo ©¦-------------------------------------------------------------------------©¦
echo =============================================================================
pause.
cls
echo.
echo ====================================
echo FLASHING bootrom.elf, please wait...
echo ====================================
echo.
flasher.exe com5 -b ..\firmware_win\bootrom\bootrom.elf
pause.
cls
title DONE
echo.
echo ___/ \___/ \___/ \___/ \___/ \___/ \___/ \___/ \___
echo / \___/ \___/ \___/ \___/ \___/ \___/ \___/ \___/ \
echo \___/ \___/ \___/ \___/ \___/ \___/ \___/ \___/ \___/
echo / \___/ \___/ \
echo \___/ \___/
echo / \ / \
echo \___/ \___/
echo / \ FLASHING OPERATION SUCCESSFUL ! Enjoy it ! / \
echo \___/ \___/
echo / \ / \
echo \___/ \___/
echo / \ BATCH FILE BY ASPER / \
echo \___/ \___/
echo / \ / \
echo \___/ \___/
echo / \___ ___/ \
echo \___/ \___ ___ ___ ___ ___ ___ ___/ \___/
echo / \___/ \___/ \___/ \___/ \___/ \___/ \___/ \___/ \
echo \___/ \___/ \___/ \___/ \___/ \___/ \___/ \___/ \___/
echo \___/ \___/ \___/ \___/ \___/ \___/ \___/ \___/
echo.
pause.
cls
MODE CON COLS=130 LINES=36
cmd.exe

View file

@ -0,0 +1,61 @@
@echo off
color 0a
MODE CON COLS=80 LINES=36
title FPGA FLASH FILE
echo.
echo.
echo.
echo ==========================================================================
echo ©¦!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! O__O !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!©¦
echo ©¦======================================================================©¦
echo ©¦FULLIMAGE FLASHER BATCH FILE ©¦
echo ©¦ ©¦
echo ©¦you will need to have this batch in \win32 folder ©¦
echo ©¦you will need to have flasher.exe in \win32 folder ©¦
echo ©¦you will need to have fullimage.elf in \firmware_win folder ©¦
echo ©¦ ©¦
echo ©¦ ©¦
echo ©¦IF YOU HAVE THOSE REQUISITES HIT ANY BUTTON TO CONTINUE ! ©¦
echo ©¦----------------------------------------------------------------------©¦
echo ==========================================================================
pause.
cls
echo.
echo ======================================
echo FLASHING fullimage.elf, please wait...
echo ======================================
echo.
flasher.exe com5 -b ..\firmware_win\fullimage.elf
pause.
cls
title DONE
echo.
echo ___/ \___/ \___/ \___/ \___/ \___/ \___/ \___/ \___
echo / \___/ \___/ \___/ \___/ \___/ \___/ \___/ \___/ \
echo \___/ \___/ \___/ \___/ \___/ \___/ \___/ \___/ \___/
echo / \___/ \___/ \
echo \___/ \___/
echo / \ / \
echo \___/ \___/
echo / \ FLASHING OPERATION SUCCESSFUL ! Enjoy it ! / \
echo \___/ \___/
echo / \ / \
echo \___/ \___/
echo / \ BATCH FILE BY ASPER / \
echo \___/ \___/
echo / \ / \
echo \___/ \___/
echo / \___ ___/ \
echo \___/ \___ ___ ___ ___ ___ ___ ___/ \___/
echo / \___/ \___/ \___/ \___/ \___/ \___/ \___/ \___/ \
echo \___/ \___/ \___/ \___/ \___/ \___/ \___/ \___/ \___/
echo \___/ \___/ \___/ \___/ \___/ \___/ \___/ \___/
echo.
pause.
cls
MODE CON COLS=130 LINES=36
cmd.exe

View file

@ -0,0 +1 @@
proxmark3 COM5

View file

@ -0,0 +1,2 @@
[Paths]
Plugins=.

BIN
msys/bin/zip.exe Normal file

Binary file not shown.

View file

@ -2,3 +2,5 @@
C:\Users\Julius\Documents\ProxSpace\devkitARM /devkitARM C:\Users\Julius\Documents\ProxSpace\devkitARM /devkitARM
C:\Users\Julius\Documents\ProxSpace\Qt\5.6 /qt C:\Users\Julius\Documents\ProxSpace\Qt\5.6 /qt
C:\Users\Julius\Documents\ProxSpace\pm3 /pm3 C:\Users\Julius\Documents\ProxSpace\pm3 /pm3
C:\Users\Julius\Documents\ProxSpace\build /build
C:\Users\Julius\Documents\ProxSpace\finished /finished

View file

@ -94,7 +94,8 @@ exit
:startsh :startsh
if NOT EXIST %WD%sh.exe goto notfound if NOT EXIST %WD%sh.exe goto notfound
start %WD%sh --login -i if NOT %autobuild% == true start %WD%sh --login -i
if %autobuild% == true start %WD%sh --login -i -c "sh /script.sh"
exit exit
:EOF :EOF

62
msys/script.sh Normal file
View file

@ -0,0 +1,62 @@
#!/bin/bash
pm3Dir=/pm3
buildDir=/build
finishedDir=/finished
qtDir=/qt
mingwDir=/mingw
cd $pm3Dir
for i in $( ls ); do
echo Processing: $i
cd $pm3Dir/$i
git fetch
git pull
hash=$(git rev-parse HEAD)
date=$(date +%Y%m%d)
if ! ls $finishedDir/$i/*-$hash.zip 1> /dev/null 2>&1; then
make clean
make all
if [ $? -eq 0 ]; then
mkdir -p $buildDir/$i/win32/lualibs
mkdir -p $buildDir/$i/win32/scripts
mkdir -p $buildDir/$i/win32/hardnested
mkdir -p $buildDir/$i/win32/platforms
mkdir -p $buildDir/$i/firmware_win/bootrom
mkdir -p "$buildDir/$i/Windows Driver"
mkdir -p "$buildDir/$i/firmware_win/JTAG Only"
mkdir -p $finishedDir/$i
rm -rf $buildDir/$i/win32/lualibs/*
rm -rf $buildDir/$i/win32/scripts/*
rm -rf $buildDir/$i/win32/hardnested/*
cp $qtDir/bin/Qt5Core.dll $buildDir/$i/win32
cp $qtDir/bin/Qt5Gui.dll $buildDir/$i/win32
cp $qtDir/bin/Qt5Widgets.dll $buildDir/$i/win32
cp $qtDir/bin/libstdc++-6.dll $buildDir/$i/win32
cp $mingwDir/bin/readline5.dll $buildDir/$i/win32
cp $qtDir/bin/libwinpthread-1.dll $buildDir/$i/win32
cp $qtDir/bin/libgcc_s_dw2-1.dll $buildDir/$i/win32
cp $qtDir/plugins/platforms/qwindows.dll $buildDir/$i/win32/platforms
cp -r /autobuild/* $buildDir/$i
cp $pm3Dir/$i/client/proxmark3.exe $buildDir/$i/win32
cp $pm3Dir/$i/client/flasher.exe $buildDir/$i/win32
cp $pm3Dir/$i/client/*.dic $buildDir/$i/win32
cp $pm3Dir/$i/client/lualibs/* $buildDir/$i/win32/lualibs
cp $pm3Dir/$i/client/scripts/* $buildDir/$i/win32/scripts
cp -r $pm3Dir/$i/client/hardnested/* $buildDir/$i/win32/hardnested
rm $buildDir/$i/win32/hardnested/*.h
rm $buildDir/$i/win32/hardnested/*.c
cp $pm3Dir/$i/armsrc/obj/fullimage.elf $buildDir/$i/firmware_win
cp $pm3Dir/$i/armsrc/obj/fullimage.s19 $buildDir/$i/firmware_win
cp $pm3Dir/$i/bootrom/obj/bootrom.elf $buildDir/$i/firmware_win/bootrom
cp $pm3Dir/$i/bootrom/obj/bootrom.s19 $buildDir/$i/firmware_win/bootrom
cp $pm3Dir/$i/recovery/bootrom.bin "$buildDir/$i/firmware_win/JTAG Only"
cp $pm3Dir/$i/recovery/fullimage.bin "$buildDir/$i/firmware_win/JTAG Only"
cp $pm3Dir/$i/recovery/proxmark3_recovery.bin "$buildDir/$i/firmware_win/JTAG Only"
cp $pm3Dir/$i/driver/proxmark3.inf "$buildDir/$i/Windows Driver"
cd $buildDir/$i
zip -r $finishedDir/$i/$date-$hash.zip ./*
else
echo $i failed
fi
fi
done

View file

@ -3,6 +3,7 @@ REM *******************************************
REM CHANGE THIS PATH TO MATCH YOUR INSTALLATION REM CHANGE THIS PATH TO MATCH YOUR INSTALLATION
REM ******************************************* REM *******************************************
set MYPATH=%~dp0 set MYPATH=%~dp0
set autobuild=false
echo #Win32_Path Mount_Point >msys/etc/fstab echo #Win32_Path Mount_Point >msys/etc/fstab
echo %MYPATH%devkitARM /devkitARM >>msys/etc/fstab echo %MYPATH%devkitARM /devkitARM >>msys/etc/fstab

14
runme_autobuild.bat Normal file
View file

@ -0,0 +1,14 @@
@echo off
REM *******************************************
REM CHANGE THIS PATH TO MATCH YOUR INSTALLATION
REM *******************************************
set MYPATH=%~dp0
set autobuild=true
echo #Win32_Path Mount_Point >msys/etc/fstab
echo %MYPATH%devkitARM /devkitARM >>msys/etc/fstab
echo %MYPATH%Qt\5.6 /qt >>msys/etc/fstab
echo %MYPATH%pm3 /pm3 >>msys/etc/fstab
echo %MYPATH%build /build >>msys/etc/fstab
echo %MYPATH%finished /finished >>msys/etc/fstab
msys\msys.bat