Browse Source

Update version keeping

Bart van Strien 14 years ago
parent
commit
bd2172f826
4 changed files with 9 additions and 14 deletions
  1. 2 3
      src/common/version.h
  2. 3 6
      src/love.cpp
  3. 1 1
      src/scripts/boot.lua
  4. 3 4
      src/scripts/boot.lua.h

+ 2 - 3
src/common/version.h

@@ -27,9 +27,8 @@ namespace love
 	const int VERSION_MAJOR = 0;
 	const int VERSION_MINOR = 8;
 	const int VERSION_REV = 0;
-	const int VERSION = VERSION_MAJOR*100 + VERSION_MINOR*10 + VERSION_REV;
-	const int VERSION_COMPATIBILITY[] =  { VERSION, 072, 071, 070, 0 };
-	const char * VERSION_STR = "0.8.0";
+	const char * VERSION = "0.8.0";
+	const char * VERSION_COMPATIBILITY[] =  { VERSION };
 	const char * VERSION_CODENAME = "Rubber Piggy";
 
 } // love

+ 3 - 6
src/love.cpp

@@ -92,12 +92,9 @@ extern "C" LOVE_EXPORT int luaopen_love(lua_State * L)
 	love::luax_insistglobal(L, "love");
 
 	// Set version information.
-	lua_pushinteger(L, love::VERSION);
+	lua_pushstring(L, love::VERSION);
 	lua_setfield(L, -2, "_version");
 
-	lua_pushstring(L, love::VERSION_STR);
-	lua_setfield(L, -2, "_version_string");
-
 	lua_pushstring(L, love::VERSION_CODENAME);
 	lua_setfield(L, -2, "_version_codename");
 
@@ -110,7 +107,7 @@ extern "C" LOVE_EXPORT int luaopen_love(lua_State * L)
 
 	for(int i = 0; love::VERSION_COMPATIBILITY[i] != 0; ++i)
 	{
-		lua_pushinteger(L, love::VERSION_COMPATIBILITY[i]);
+		lua_pushstring(L, love::VERSION_COMPATIBILITY[i]);
 		lua_rawseti(L, -2, i+1);
 	}
 
@@ -239,7 +236,7 @@ int main(int argc, char ** argv)
 
 	// Oh, you just want the version? Okay!
 	if(argc > 1 && strcmp(argv[1],"--version") == 0) {
-		printf("LOVE %s (%s)\n", love::VERSION_STR, love::VERSION_CODENAME);
+		printf("LOVE %s (%s)\n", love::VERSION, love::VERSION_CODENAME);
 		return 0;
 	}
 

+ 1 - 1
src/scripts/boot.lua

@@ -601,7 +601,7 @@ function love.nogame()
 	end
 
 	function love.conf(t)
-		t.title = "L\195\150VE " .. love._version_string .. " (" .. love._version_codename .. ")"
+		t.title = "L\195\150VE " .. love._version .. " (" .. love._version_codename .. ")"
 		t.modules.audio = false
 		t.modules.sound = false
 		t.modules.physics = false

+ 3 - 4
src/scripts/boot.lua.h

@@ -1512,10 +1512,9 @@ const unsigned char boot_lua[] =
 	0x66, 0x28, 0x74, 0x29, 0x0a,
 	0x09, 0x09, 0x74, 0x2e, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x20, 0x3d, 0x20, 0x22, 0x4c, 0x5c, 0x31, 0x39, 0x35, 
 	0x5c, 0x31, 0x35, 0x30, 0x56, 0x45, 0x20, 0x22, 0x20, 0x2e, 0x2e, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x5f, 
-	0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x20, 0x2e, 0x2e, 0x20, 
-	0x22, 0x20, 0x28, 0x22, 0x20, 0x2e, 0x2e, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x5f, 0x76, 0x65, 0x72, 0x73, 
-	0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x2e, 0x2e, 0x20, 0x22, 0x29, 
-	0x22, 0x0a,
+	0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x20, 0x2e, 0x2e, 0x20, 0x22, 0x20, 0x28, 0x22, 0x20, 0x2e, 0x2e, 
+	0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x5f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x64, 
+	0x65, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x2e, 0x2e, 0x20, 0x22, 0x29, 0x22, 0x0a,
 	0x09, 0x09, 0x74, 0x2e, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x73, 0x2e, 0x61, 0x75, 0x64, 0x69, 0x6f, 0x20, 
 	0x3d, 0x20, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x0a,
 	0x09, 0x09, 0x74, 0x2e, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x73, 0x2e, 0x73, 0x6f, 0x75, 0x6e, 0x64, 0x20,