From 6774a920294211e7d915dbe7ab52cc39864588b3 Mon Sep 17 00:00:00 2001 From: def Date: Sat, 29 Mar 2014 00:24:34 +0100 Subject: [PATCH] Cleanup --- announcement.txt | 5 +--- bam.lua | 4 +-- .../{DDRace-Server.icns => DDNet-Server.icns} | Bin .../{DDRace-Server.ico => DDNet-Server.ico} | Bin scripts/make_release.py | 26 +++++++++--------- src/game/collision.cpp | 2 +- src/osxlaunch/server.m | 4 +-- src/osxlaunch/server_mysql.m | 4 +-- 8 files changed, 21 insertions(+), 24 deletions(-) rename other/icons/{DDRace-Server.icns => DDNet-Server.icns} (100%) rename other/icons/{DDRace-Server.ico => DDNet-Server.ico} (100%) diff --git a/announcement.txt b/announcement.txt index b361b965f..26b2edecb 100644 --- a/announcement.txt +++ b/announcement.txt @@ -1,4 +1 @@ -# (c) Shereef Marzouk. See "licence DDRace.txt" and the readme.txt in the root of the distribution for more information. -# This file has the text that is announced every once and a while on the server -Please Visit DDRace.info to report any bugs Thanks -# This File must always have a line break at the end of file +Please visit ddnet.tw to report any bugs. diff --git a/bam.lua b/bam.lua index 3dca12e7a..54480746f 100644 --- a/bam.lua +++ b/bam.lua @@ -304,11 +304,11 @@ function build(settings) end -- build client, server, version server and master server - client_exe = Link(client_settings, "DDRace", game_shared, game_client, + client_exe = Link(client_settings, "DDNet", game_shared, game_client, engine, client, game_editor, zlib, pnglite, wavpack, client_link_other, client_osxlaunch) - server_exe = Link(server_settings, "DDRace-Server", engine, server, + server_exe = Link(server_settings, "DDNet-Server", engine, server, game_shared, game_server, zlib, server_link_other) serverlaunch = {} diff --git a/other/icons/DDRace-Server.icns b/other/icons/DDNet-Server.icns similarity index 100% rename from other/icons/DDRace-Server.icns rename to other/icons/DDNet-Server.icns diff --git a/other/icons/DDRace-Server.ico b/other/icons/DDNet-Server.ico similarity index 100% rename from other/icons/DDRace-Server.ico rename to other/icons/DDNet-Server.ico diff --git a/scripts/make_release.py b/scripts/make_release.py index 777cf452a..cee24626b 100644 --- a/scripts/make_release.py +++ b/scripts/make_release.py @@ -7,7 +7,7 @@ if len(sys.argv) != 3: print(sys.argv[0], "VERSION PLATFORM") sys.exit(-1) -name = "DDRace" +name = "DDNet" version = sys.argv[1] platform = sys.argv[2] exe_ext = "" @@ -75,13 +75,13 @@ if include_data and not use_bundle: shutil.copy("other/config_directory.bat", package_dir) shutil.copy("SDL.dll", package_dir) shutil.copy("freetype.dll", package_dir) - shutil.copy("libmysql.dll", package_dir) - shutil.copy("mysqlcppconn.dll", package_dir) + #shutil.copy("libmysql.dll", package_dir) + #shutil.copy("mysqlcppconn.dll", package_dir) if include_exe and not use_bundle: shutil.copy(name+exe_ext, package_dir) shutil.copy(name+"-Server"+exe_ext, package_dir) - shutil.copy(name+"-Server_sql"+exe_ext, package_dir) + #shutil.copy(name+"-Server_sql"+exe_ext, package_dir) if include_src: for p in ["src", "scripts", "datasrc", "other", "objs"]: @@ -103,12 +103,12 @@ if use_bundle: os.system("lipo -create -output "+bin+" "+" ".join(to_lipo)) # create Teeworlds appfolder - clientbundle_content_dir = os.path.join(package_dir, "DDRace.app/Contents") + clientbundle_content_dir = os.path.join(package_dir, "DDNet.app/Contents") clientbundle_bin_dir = os.path.join(clientbundle_content_dir, "MacOS") clientbundle_resource_dir = os.path.join(clientbundle_content_dir, "Resources") clientbundle_framework_dir = os.path.join(clientbundle_content_dir, "Frameworks") binary_path = clientbundle_bin_dir + "/" + name+exe_ext - os.mkdir(os.path.join(package_dir, "DDRace.app")) + os.mkdir(os.path.join(package_dir, "DDNet.app")) os.mkdir(clientbundle_content_dir) os.mkdir(clientbundle_bin_dir) os.mkdir(clientbundle_resource_dir) @@ -132,7 +132,7 @@ if use_bundle: CFBundleDevelopmentRegion English CFBundleExecutable - DDRace + DDNet CFBundleIconFile DDNet CFBundleInfoDictionaryVersion @@ -149,10 +149,10 @@ if use_bundle: file(os.path.join(clientbundle_content_dir, "PkgInfo"), "w").write("APPL????") # create Teeworlds Server appfolder - serverbundle_content_dir = os.path.join(package_dir, "DDRace-Server.app/Contents") + serverbundle_content_dir = os.path.join(package_dir, "DDNet-Server.app/Contents") serverbundle_bin_dir = os.path.join(serverbundle_content_dir, "MacOS") serverbundle_resource_dir = os.path.join(serverbundle_content_dir, "Resources") - os.mkdir(os.path.join(package_dir, "DDRace-Server.app")) + os.mkdir(os.path.join(package_dir, "DDNet-Server.app")) os.mkdir(serverbundle_content_dir) os.mkdir(serverbundle_bin_dir) os.mkdir(serverbundle_resource_dir) @@ -160,7 +160,7 @@ if use_bundle: os.mkdir(os.path.join(serverbundle_resource_dir, "data/maps")) os.mkdir(os.path.join(serverbundle_resource_dir, "data/mapres")) copydir("data/maps", serverbundle_resource_dir) - shutil.copy("other/icons/DDRace-Server.icns", serverbundle_resource_dir) + shutil.copy("other/icons/DDNet-Server.icns", serverbundle_resource_dir) shutil.copy(name+"-Server"+exe_ext, serverbundle_bin_dir) shutil.copy("serverlaunch"+exe_ext, serverbundle_bin_dir + "/"+name+"_server") file(os.path.join(serverbundle_content_dir, "Info.plist"), "w").write(""" @@ -171,9 +171,9 @@ if use_bundle: CFBundleDevelopmentRegion English CFBundleExecutable - DDRace_server + DDNet_server CFBundleIconFile - DDRace-Server + DDNet-Server CFBundleInfoDictionaryVersion 6.0 CFBundlePackageType @@ -205,7 +205,7 @@ if use_gz: if use_dmg: print("making disk image") os.system("rm -f %s.dmg %s_temp.dmg" % (package, package)) - os.system("hdiutil create -srcfolder %s -volname DDRace -quiet %s_temp" % (package_dir, package)) + os.system("hdiutil create -srcfolder %s -volname DDNet -quiet %s_temp" % (package_dir, package)) os.system("hdiutil convert %s_temp.dmg -format UDBZ -o %s.dmg -quiet" % (package, package)) os.system("rm -f %s_temp.dmg" % package) diff --git a/src/game/collision.cpp b/src/game/collision.cpp index 5b1a36574..45bf3ffd1 100644 --- a/src/game/collision.cpp +++ b/src/game/collision.cpp @@ -981,7 +981,7 @@ int CCollision::Entity(int x, int y, int Layer) default: str_format(aBuf,sizeof(aBuf), "Unknown"); } - dbg_msg("CCollision::Entity","Something is VERY wrong with the %s layer please report this at http://DDRace.info, you will need to post the map as well and aNy steps that u think may have led to this, Please Also Read the News Section every once and a while", aBuf); + dbg_msg("CCollision::Entity","Something is VERY wrong with the %s layer please report this at http://ddnet.tw, you will need to post the map as well and any steps that u think may have led to this", aBuf); return 0; } switch (Layer) diff --git a/src/osxlaunch/server.m b/src/osxlaunch/server.m index 1aff6bc5d..e542ff16f 100644 --- a/src/osxlaunch/server.m +++ b/src/osxlaunch/server.m @@ -83,7 +83,7 @@ void runServer() backing: NSBackingStoreBuffered defer: NO]; - [window setTitle: @"DDRace Server"]; + [window setTitle: @"DDNet Server"]; view = [[[ServerView alloc] initWithFrame: graphicsRect] autorelease]; [view setEditable: NO]; @@ -94,7 +94,7 @@ void runServer() [window makeKeyAndOrderFront: nil]; [view listenTo: task]; - [task setLaunchPath: [mainBundle pathForAuxiliaryExecutable: @"DDRace-Server"]]; + [task setLaunchPath: [mainBundle pathForAuxiliaryExecutable: @"DDNet-Server"]]; [task setArguments: arguments]; [task launch]; [NSApp run]; diff --git a/src/osxlaunch/server_mysql.m b/src/osxlaunch/server_mysql.m index 89430cd93..1a553d7d6 100644 --- a/src/osxlaunch/server_mysql.m +++ b/src/osxlaunch/server_mysql.m @@ -83,7 +83,7 @@ void runServer() backing: NSBackingStoreBuffered defer: NO]; - [window setTitle: @"DDRace Server"]; + [window setTitle: @"DDNet Server"]; view = [[[ServerView alloc] initWithFrame: graphicsRect] autorelease]; [view setEditable: NO]; @@ -94,7 +94,7 @@ void runServer() [window makeKeyAndOrderFront: nil]; [view listenTo: task]; - [task setLaunchPath: [mainBundle pathForAuxiliaryExecutable: @"DDRace-Server_sql"]]; + [task setLaunchPath: [mainBundle pathForAuxiliaryExecutable: @"DDNet-Server_sql"]]; [task setArguments: arguments]; [task launch]; [NSApp run];