diff --git a/Makefile.main b/Makefile.main index 9a92ef3b..c8a4de2d 100644 --- a/Makefile.main +++ b/Makefile.main @@ -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 diff --git a/out/boot.dol b/out/boot.dol index 708c6500..40c75289 100644 Binary files a/out/boot.dol and b/out/boot.dol differ diff --git a/scripts/svnrev.sh b/scripts/svnrev.sh deleted file mode 100644 index 77bd2814..00000000 --- a/scripts/svnrev.sh +++ /dev/null @@ -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 < ./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 diff --git a/source/const_str.hpp b/source/const_str.hpp index a871a143..632bafda 100644 --- a/source/const_str.hpp +++ b/source/const_str.hpp @@ -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); diff --git a/source/defines.h b/source/defines.h index 8a453c73..dafc6d10 100644 --- a/source/defines.h +++ b/source/defines.h @@ -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" diff --git a/source/menu/menu.cpp b/source/menu/menu.cpp index 96ac28e7..5b9e54d5 100644 --- a/source/menu/menu.cpp +++ b/source/menu/menu.cpp @@ -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; diff --git a/source/menu/menu_download.cpp b/source/menu/menu_download.cpp index 496c01ed..97b58183 100644 --- a/source/menu/menu_download.cpp +++ b/source/menu/menu_download.cpp @@ -4,7 +4,6 @@ #include #include "menu.hpp" -#include "svnrev.h" #include "types.h" #include "lockMutex.hpp" #include "channel/nand.hpp" diff --git a/source/menu/menu_system.cpp b/source/menu/menu_system.cpp index 6b0d3901..85484dd4 100644 --- a/source/menu/menu_system.cpp +++ b/source/menu/menu_system.cpp @@ -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;