Permalink
Browse files

more test

  • Loading branch information...
1 parent 39cc40b commit 7e9a5ceded1ee95d462fd33cd1aee359f322e8e5 Scott Davies committed Apr 13, 2015
Showing with 15 additions and 3 deletions.
  1. +1 −0 .gitignore
  2. +13 −2 RA_Integration/MakeBuildVer.bat
  3. +1 −1 RA_Integration/RA_Core.cpp
View
@@ -261,3 +261,4 @@
/RA_Integration/RA_BuildVer.h
/RA_Integration/Diffs.txt
/RA_Integration/LiveTag.txt
+/RA_Integration/Temp.txt
@@ -1,10 +1,13 @@
@echo off
-REM git describe --tags --long > LiveTag.txt
git describe --tags --match "RAIntegration.*" > LiveTag.txt
@set /p ACTIVE_TAG=<LiveTag.txt
@set VERSION_NUM=%ACTIVE_TAG:~14,3%
+git rev-parse --abbrev-ref HEAD > Temp.txt
+@set /p ACTIVE_BRANCH=<LiveTag.txt
+@if NOT "%ACTIVE_BRANCH%"=="master" GOTO NonMasterBranch
+
git diff HEAD > Diffs.txt
@set /p RAW_DIFFS_FOUND=<Diffs.txt
@@ -13,4 +16,12 @@ setlocal
@if %DIFF_FILE_SIZE% GTR 0 set ACTIVE_TAG=Unstaged Changes
@echo RAIntegration Tag: %ACTIVE_TAG% (%VERSION_NUM%)
-@echo #define RA_INTEGRATION_VERSION "0.%VERSION_NUM%" > ./RA_BuildVer.h
+@echo #define RA_INTEGRATION_VERSION "0.%VERSION_NUM%" > ./RA_BuildVer.h
+
+@GOTO End
+
+:NonMasterBranch
+@echo RAIntegration Tag 0.000 - Not on Master Branch!
+@echo #define RA_INTEGRATION_VERSION "0.000" > ./RA_BuildVer.h
+
+:End
@@ -7,7 +7,7 @@
#include "RA_CodeNotes.h"
#include "RA_Defs.h"
#include "RA_httpthread.h"
-#include "RA_ImageFactory.h"
+#include "RA_ImageFactory.h"
#include "RA_Interface.h"
#include "RA_Leaderboard.h"
#include "RA_md5factory.h"

0 comments on commit 7e9a5ce

Please sign in to comment.