-removed svn script. will have to manually update it from now on.

This commit is contained in:
Fledge68 2018-08-08 18:41:33 -05:00
parent fcc1b79354
commit c3f3cfaa96
8 changed files with 6 additions and 48 deletions

View File

@ -139,7 +139,6 @@ export OUTPUT := $(CURDIR)/out/$(TARGET)
#---------------------------------------------------------------------------------
$(BUILD):
@[ -d $@ ] || mkdir -p $@
@bash ./scripts/svnrev.sh
@bash ./scripts/buildtype.sh $(ios)
@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile.main
@ -150,7 +149,7 @@ all:
#---------------------------------------------------------------------------------
clean:
@echo clean ...
@rm -fr $(BUILD) $(OUTPUT).elf $(OUTPUT).dol $(CURDIR)/source/svnrev.h \
@rm -fr $(BUILD) $(OUTPUT).elf $(OUTPUT).dol \
$(CURDIR)/source/loader/alt_ios_gen.h $(CURDIR)/out/bins/ext_loader.bin \
$(CURDIR)/out/bins/ext_booter.bin $(CURDIR)/out/bins/app_booter.bin

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 MiB

After

Width:  |  Height:  |  Size: 3.3 MiB

View File

@ -1,43 +0,0 @@
#!/bin/bash
#
echo svnrev.sh
rev_new_raw=$(svnversion -n . 2>/dev/null | tr '\n' ' ' | tr -d '\r')
[ -n "$rev_new_raw" ] || rev_new_raw=$(SubWCRev . 2>/dev/null | tr '\n' ' ' | tr -d '\r')
if [ "$rev_new_raw" == "exported" ];
then
echo This copy of wiiflow is not under source control
exit
fi
rev_new_raw=$(echo $rev_new_raw | sed 's/[^0-9]*\([0-9]*\)\(.*\)/\1 \2/')
rev_new=0
a=$(echo $rev_new_raw | sed 's/\([0-9]*\).*/\1/')
let "a+=0"
#find max rev
while [ "$a" ]; do
[ "$a" -gt "$rev_new" ] && rev_new=$a
rev_new_raw=$(echo -n $rev_new_raw | sed 's/[0-9]*[^0-9]*\([0-9]*\)\(.*\)/\1 \2/')
a=$(echo $rev_new_raw | sed 's/\([0-9]*\).*/\1/')
done
rev_old=$(cat ./source/svnrev.h 2>/dev/null | tr -d '\n' | sed 's/[^0-9]*\([0-9]*\).*/\1/')
rev_new=`expr $rev_new + 1`
if [ "$rev_new" != "$rev_old" ] || [ ! -f ./source/svnrev.h ]; then
cat <<EOF > ./source/svnrev.h
#define SVN_REV "$rev_new"
EOF
if [ -n "$rev_old" ]; then
echo "Changed Rev $rev_old to $rev_new" >&2
fi
rev_new=`expr $rev_new + 1`
rev_date=`date +%Y%m%d%H%M -u`
fi

View File

@ -5,7 +5,6 @@
#include "wstringEx/wstringEx.hpp"
#include "gui/text.hpp"
#include "defines.h"
#include "svnrev.h"
static const string &VERSION_STRING = sfmt("%s %s (r%s)", APP_NAME, APP_VERSION, SVN_REV);
static const wstringEx SVN_REV_W(SVN_REV);

View File

@ -1,5 +1,7 @@
#define APP_NAME "WiiFlow Lite"
#define APP_VERSION "4.4.0"
#define SVN_REV "1161"
#define APP_DATA_DIR "wiiflow"
#define APPS_DIR "apps/wiiflow_lite"

View File

@ -39,6 +39,8 @@ CMenu mainMenu;
u8 CMenu::downloadStack[8192] ATTRIBUTE_ALIGN(32);
const u32 CMenu::downloadStackSize = 8192;
const int CMenu::SVN_REV_NUM = atoi(SVN_REV);
CMenu::CMenu()
{
m_aa = 0;

View File

@ -4,7 +4,6 @@
#include <fstream>
#include "menu.hpp"
#include "svnrev.h"
#include "types.h"
#include "lockMutex.hpp"
#include "channel/nand.hpp"

View File

@ -5,7 +5,7 @@
#include "loader/wbfs.h"
unsigned int i, version_num = 0, num_versions = 0;
const int CMenu::SVN_REV_NUM = atoi(SVN_REV);
//const int CMenu::SVN_REV_NUM = atoi(SVN_REV);
int CMenu::_version[9] = {0, SVN_REV_NUM, SVN_REV_NUM, SVN_REV_NUM, SVN_REV_NUM, SVN_REV_NUM, SVN_REV_NUM, SVN_REV_NUM, SVN_REV_NUM};
const int pixels_to_skip = 10;