diff --git a/CMakeLists.txt b/CMakeLists.txt index 121f9cca2..bff3fa189 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1290,7 +1290,6 @@ set(CPACK_SOURCE_FILES README.md autoexec_server.cfg cmake/ - configure.lua data/ datasrc/ ddnet-libs/ diff --git a/README.md b/README.md index f09ec6c87..a6f86e437 100644 --- a/README.md +++ b/README.md @@ -124,5 +124,5 @@ $ mkdir build $ cd build $ cmake -DMYSQL=ON .. $ make -$ ./DDNet-Server_sql -f mine.cfg +$ ./DDNet-Server -f mine.cfg ``` diff --git a/scripts/make_release.py b/scripts/make_release.py deleted file mode 100644 index 8042a7d72..000000000 --- a/scripts/make_release.py +++ /dev/null @@ -1,219 +0,0 @@ -import shutil, os, sys, zipfile - -#valid_platforms = ["win32", "linux86", "linux86_64", "src"] - -if len(sys.argv) != 3: - print("wrong number of arguments") - print(sys.argv[0], "VERSION PLATFORM") - sys.exit(-1) - -name = "DDNet" -version = sys.argv[1] -platform = sys.argv[2] -exe_ext = "" -use_zip = 0 -use_xz = 1 -use_dmg = 0 -use_bundle = 0 -include_data = True -include_exe = True -include_src = False - -if platform == "src": - include_data = True - include_exe = False - include_src = True - use_zip = 1 - use_xz = 1 - -#if not platform in valid_platforms: -# print("not a valid platform") -# print(valid_platforms) -# sys.exit(-1) - -if platform == 'win32' or platform == 'win64': - exe_ext = ".exe" - use_zip = 1 - use_xz = 0 -if platform == 'osx': - use_dmg = 1 - use_xz = 0 - use_bundle = 1 - -def copydir(src, dst, excl=[]): - for root, dirs, files in os.walk(src, topdown=True): - if "/." in root or "\\." in root: - continue - for name in dirs: - if name[0] != '.': - os.mkdir(os.path.join(dst, root, name)) - for name in files: - if name[0] != '.': - shutil.copy(os.path.join(root, name), os.path.join(dst, root, name)) - -package = "%s-%s-%s" %(name, version, platform) -package_dir = package - -print("cleaning target") -shutil.rmtree(package_dir, True) -os.mkdir(package_dir) - -print("adding files") -shutil.copy("license.txt", package_dir) -shutil.copy("storage.cfg", package_dir) -shutil.copy("autoexec_server.cfg", package_dir) - -if include_data and not use_bundle: - os.mkdir(os.path.join(package_dir, "data")) - copydir("data", package_dir) - if platform[:3] == "win": - shutil.copy("other/config_directory.bat", package_dir) - shutil.copy("SDL2.dll", package_dir) - shutil.copy("libfreetype.dll", package_dir) - if platform == "win32": - shutil.copy("libgcc_s_sjlj-1.dll", package_dir) - shutil.copy("libwinpthread-1.dll", package_dir) - shutil.copy("libogg.dll", package_dir) - shutil.copy("libopus.dll", package_dir) - shutil.copy("libopusfile.dll", package_dir) - shutil.copy("libcurl.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("dilate"+exe_ext, package_dir) - shutil.copy("config_store"+exe_ext, package_dir) - shutil.copy("config_retrieve"+exe_ext, package_dir) - shutil.copy("map_extract"+exe_ext, package_dir) - shutil.copy("map_diff"+exe_ext, package_dir) - #shutil.copy(name+"-Server_sql"+exe_ext, package_dir) - -if include_src: - for p in ["src", "scripts", "datasrc", "other", "objs"]: - os.mkdir(os.path.join(package_dir, p)) - copydir(p, package_dir) - shutil.copy("configure.lua", package_dir) - -if use_bundle: - bins = [name, name+'-Server', 'dilate', 'config_store', 'config_retrieve', 'map_extract', 'map_diff', 'serverlaunch'] - platforms = ('x86', 'x86_64', 'ppc') - for bin in bins: - to_lipo = [] - for p in platforms: - fname = bin+'_'+p - if os.path.isfile(fname): - to_lipo.append(fname) - if to_lipo: - os.system("lipo -create -output "+bin+" "+" ".join(to_lipo)) - - # create Teeworlds appfolder - 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, "DDNet.app")) - os.mkdir(clientbundle_content_dir) - os.mkdir(clientbundle_bin_dir) - os.mkdir(clientbundle_resource_dir) - os.mkdir(clientbundle_framework_dir) - os.mkdir(os.path.join(clientbundle_resource_dir, "data")) - copydir("data", clientbundle_resource_dir) - - - shutil.copy("other/icons/DDNet.icns", clientbundle_resource_dir) - shutil.copy(name+exe_ext, clientbundle_bin_dir) - os.system("install_name_tool -change /opt/X11/lib/libfreetype.6.dylib @executable_path/../Frameworks/libfreetype.6.dylib " + binary_path) - os.system("install_name_tool -change @rpath/SDL2.framework/Versions/A/SDL2 @executable_path/../Frameworks/SDL2.framework/SDL2 " + binary_path) - os.system("cp -R /Library/Frameworks/SDL2.framework " + clientbundle_framework_dir) - os.system("cp /opt/X11/lib/libfreetype.6.dylib " + clientbundle_framework_dir) - file(os.path.join(clientbundle_content_dir, "Info.plist"), "w").write(""" - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - DDNet - CFBundleIconFile - DDNet - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - APPL - CFBundleSignature - ???? - CFBundleVersion - %s - CFBundleIdentifier - org.DDNetClient.app - NSHighResolutionCapable - - - - """ % (version)) - file(os.path.join(clientbundle_content_dir, "PkgInfo"), "w").write("APPL????") - - # create Teeworlds Server appfolder - 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, "DDNet-Server.app")) - os.mkdir(serverbundle_content_dir) - os.mkdir(serverbundle_bin_dir) - os.mkdir(serverbundle_resource_dir) - os.mkdir(os.path.join(serverbundle_resource_dir, "data")) - 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/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(""" - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - DDNet_server - CFBundleIconFile - DDNet-Server - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - APPL - CFBundleSignature - ???? - CFBundleVersion - %s - - - """ % (version)) - file(os.path.join(serverbundle_content_dir, "PkgInfo"), "w").write("APPL????") - -if use_zip: - print("making zip archive") - zf = zipfile.ZipFile("%s.zip" % package, 'w', zipfile.ZIP_DEFLATED) - - for root, dirs, files in os.walk(package_dir, topdown=True): - for name in files: - n = os.path.join(root, name) - zf.write(n, n) - #zf.printdir() - zf.close() - -if use_xz: - print("making tar.xz archive") - os.system("XZ_OPT=-9 tar cJf %s.tar.xz %s" % (package, package_dir)) - -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 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) - -print("done")