diff --git a/trunk/ConsoleDataMigration/sources/ConsoleBackup/ConsoleBackup.cpp b/trunk/ConsoleDataMigration/sources/ConsoleBackup/ConsoleBackup.cpp index 18ebc3c..f095242 100644 --- a/trunk/ConsoleDataMigration/sources/ConsoleBackup/ConsoleBackup.cpp +++ b/trunk/ConsoleDataMigration/sources/ConsoleBackup/ConsoleBackup.cpp @@ -57,7 +57,7 @@ #include "ResFont.h" // svnリビジョン埋め込み用 -#include "version.h" +#include "../../generated/ConsoleBackup/version.h" #ifndef BACKUP_VERSION_NUM #define BACKUP_VERSION_NUM 0 #endif diff --git a/trunk/ConsoleDataMigration/sources/ConsoleBackup/OMakefile b/trunk/ConsoleDataMigration/sources/ConsoleBackup/OMakefile index 44be172..14f6478 100644 --- a/trunk/ConsoleDataMigration/sources/ConsoleBackup/OMakefile +++ b/trunk/ConsoleDataMigration/sources/ConsoleBackup/OMakefile @@ -81,7 +81,7 @@ DESCRIPTOR = $(HORIZON_ROOT)/resources/specfiles/_private/RepairTool. include $(ROOT_OMAKE)/modulerules -VERSION_H = $(file version.h) +VERSION_H = $(file ../../generated/$(TARGET_PROGRAM)/version.h) $(VERSION_H): $(SOURCES) section diff --git a/trunk/ConsoleDataMigration/sources/ConsoleBackup/genversion.sh b/trunk/ConsoleDataMigration/sources/ConsoleBackup/genversion.sh index 8fa6ee8..0294617 100755 --- a/trunk/ConsoleDataMigration/sources/ConsoleBackup/genversion.sh +++ b/trunk/ConsoleDataMigration/sources/ConsoleBackup/genversion.sh @@ -1,4 +1,4 @@ #!/bin/bash -f -cd ../ +cd ../../generated/ echo "#define BACKUP_VERSION_NUM \"`svn info|grep 'Last Changed Rev:'| awk -F ':' '{print $2}'|tr -d '\n'| sed 's/ //g'`\"" > ./ConsoleBackup/version.h diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.cpp index ef666a7..cc0c90b 100644 --- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.cpp +++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.cpp @@ -50,7 +50,7 @@ #include "ResFont.h" // svnリビジョン埋め込み用 -#include "version.h" +#include "../../generated/ConsoleRestore/version.h" #ifndef RESTORE_VERSION_NUM #define RESOTRE_VERSION_NUM 0 #endif diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/OMakefile b/trunk/ConsoleDataMigration/sources/ConsoleRestore/OMakefile index 404f8d7..fcaafe4 100644 --- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/OMakefile +++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/OMakefile @@ -87,11 +87,11 @@ DESCRIPTOR = $(HORIZON_ROOT)/resources/specfiles/_private/RepairTool. include $(ROOT_OMAKE)/modulerules -VERSION_H = $(file version.h) +VERSION_H = $(file ../../generated/$(TARGET_PROGRAM)/version.h) $(VERSION_H): $(SOURCES) section bash genversion.sh RequireSetup($(VERSION_H)) -build: version.h $(DEFAULT_TARGETS) +build: $(VERSION_H) $(DEFAULT_TARGETS) diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/genversion.sh b/trunk/ConsoleDataMigration/sources/ConsoleRestore/genversion.sh index 99daed5..136a54a 100755 --- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/genversion.sh +++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/genversion.sh @@ -1,4 +1,4 @@ #!/bin/bash -f -cd ../ +cd ../../generated/ echo "#define RESTORE_VERSION_NUM \"`svn info|grep 'Last Changed Rev:'| awk -F ':' '{print $2}'|tr -d '\n'| sed 's/ //g'`\"" > ./ConsoleRestore/version.h