From 0630b7543dc4033cdaf7c680b8f9379f774bd8c7 Mon Sep 17 00:00:00 2001 From: Saran Tunyasuvunakool Date: Thu, 20 Apr 2023 07:52:03 -0700 Subject: [PATCH] Bump version number to 2.3.4. PiperOrigin-RevId: 525745444 Change-Id: I8a9994b72a0a2ba3f371bee2c2bea947ad8f4fd1 --- CMakeLists.txt | 2 +- dist/mujoco.rc | 8 ++++---- dist/simulate.rc | 8 ++++---- doc/APIreference/APIglobals.rst | 2 +- doc/unity.rst | 4 ++-- include/mujoco/mujoco.h | 2 +- python/mujoco/CMakeLists.txt | 4 ++-- python/mujoco/mjpython/Info.plist | 8 ++++---- python/setup.py | 2 +- sample/CMakeLists.txt | 2 +- simulate/CMakeLists.txt | 2 +- src/engine/engine_support.c | 4 ++-- unity/Editor/Bindings/MujocoBinaryRetriever.cs | 4 ++-- unity/Runtime/Bindings/MjBindings.cs | 2 +- unity/package.json | 2 +- 15 files changed, 28 insertions(+), 28 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 43ffb533..b6531f2c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,7 +28,7 @@ set(MSVC_INCREMENTAL_DEFAULT ON) project( mujoco - VERSION 2.3.3 + VERSION 2.3.4 DESCRIPTION "MuJoCo Physics Simulator" HOMEPAGE_URL "https://mujoco.org" ) diff --git a/dist/mujoco.rc b/dist/mujoco.rc index db0430ea..b9227dd9 100644 --- a/dist/mujoco.rc +++ b/dist/mujoco.rc @@ -1,6 +1,6 @@ 1 VERSIONINFO -FILEVERSION 2,3,3,0 -PRODUCTVERSION 2,3,3,0 +FILEVERSION 2,3,4,0 +PRODUCTVERSION 2,3,4,0 FILEOS 0x4 FILETYPE 0x1 { @@ -9,9 +9,9 @@ FILETYPE 0x1 BLOCK "040904b0" { VALUE "ProductName", "MuJoCo" - VALUE "ProductVersion", "2.3.3" + VALUE "ProductVersion", "2.3.4" VALUE "FileDescription", "MuJoCo" - VALUE "FileVersion", "2.3.3" + VALUE "FileVersion", "2.3.4" VALUE "InternalName", "mujoco.dll" VALUE "OriginalFilename", "mujoco.dll" VALUE "CompanyName", "DeepMind" diff --git a/dist/simulate.rc b/dist/simulate.rc index 83584eab..0570bf1f 100644 --- a/dist/simulate.rc +++ b/dist/simulate.rc @@ -1,8 +1,8 @@ MUJOCO ICON "mujoco.ico" 1 VERSIONINFO -FILEVERSION 2,3,3,0 -PRODUCTVERSION 2,3,3,0 +FILEVERSION 2,3,4,0 +PRODUCTVERSION 2,3,4,0 FILEOS 0x4 FILETYPE 0x1 { @@ -11,9 +11,9 @@ FILETYPE 0x1 BLOCK "040904b0" { VALUE "ProductName", "MuJoCo" - VALUE "ProductVersion", "2.3.3" + VALUE "ProductVersion", "2.3.4" VALUE "FileDescription", "MuJoCo" - VALUE "FileVersion", "2.3.3" + VALUE "FileVersion", "2.3.4" VALUE "InternalName", "simulate.exe" VALUE "OriginalFilename", "simulate.exe" VALUE "CompanyName", "DeepMind" diff --git a/doc/APIreference/APIglobals.rst b/doc/APIreference/APIglobals.rst index a4e0914a..a417af64 100644 --- a/doc/APIreference/APIglobals.rst +++ b/doc/APIreference/APIglobals.rst @@ -508,7 +508,7 @@ table below. Their names are in the format ``mjKEY_XXX``. They correspond to GLF - Maximum number of UI rectangles. Defined in `mjui.h `_. * - ``mjVERSION_HEADER`` - - 233 + - 234 - The version of the MuJoCo headers; changes with every release. This is an integer equal to 100x the software version, so 210 corresponds to version 2.1. Defined in mujoco.h. The API function :ref:`mj_version` returns a number with the same meaning but for the compiled library. diff --git a/doc/unity.rst b/doc/unity.rst index c816db19..352e6ce6 100644 --- a/doc/unity.rst +++ b/doc/unity.rst @@ -30,14 +30,14 @@ _____ The MuJoCo app needs to be run at least once before the native library can be used, in order to register the library as a trusted binary. Then, copy the dynamic library file from -``/Applications/MuJoCo.app/Contents/Frameworks/mujoco.framework/Versions/Current/libmujoco.2.3.3.dylib`` (it can be +``/Applications/MuJoCo.app/Contents/Frameworks/mujoco.framework/Versions/Current/libmujoco.2.3.4.dylib`` (it can be found by browsing the contents of ``MuJoCo.app``) and rename it as ``mujoco.dylib``. Linux _____ Expand the ``tar.gz`` archive to ``~/.mujoco``. Then copy the dynamic library from -``~/.mujoco/mujoco-2.3.3/lib/libmujoco.so.2.3.3`` and rename it as ``libmujoco.so``. +``~/.mujoco/mujoco-2.3.4/lib/libmujoco.so.2.3.4`` and rename it as ``libmujoco.so``. Windows _______ diff --git a/include/mujoco/mujoco.h b/include/mujoco/mujoco.h index 0259b3e1..d735dc41 100644 --- a/include/mujoco/mujoco.h +++ b/include/mujoco/mujoco.h @@ -24,7 +24,7 @@ extern "C" { #endif // header version; should match the library version as returned by mj_version() -#define mjVERSION_HEADER 233 +#define mjVERSION_HEADER 234 // needed to define size_t, fabs and log10 #include diff --git a/python/mujoco/CMakeLists.txt b/python/mujoco/CMakeLists.txt index a61f2861..34f890cb 100644 --- a/python/mujoco/CMakeLists.txt +++ b/python/mujoco/CMakeLists.txt @@ -84,7 +84,7 @@ if(NOT TARGET mujoco) if(MUJOCO_FRAMEWORK) message("MuJoCo framework is at ${MUJOCO_FRAMEWORK}/mujoco.framework") set(MUJOCO_LIBRARY - ${MUJOCO_FRAMEWORK}/mujoco.framework/Versions/A/libmujoco.2.3.3.dylib + ${MUJOCO_FRAMEWORK}/mujoco.framework/Versions/A/libmujoco.2.3.4.dylib ) target_compile_options(mujoco INTERFACE -F${MUJOCO_FRAMEWORK}) endif() @@ -92,7 +92,7 @@ if(NOT TARGET mujoco) if(NOT MUJOCO_FRAMEWORK) find_library( - MUJOCO_LIBRARY mujoco mujoco.2.3.3 HINTS ${MUJOCO_LIBRARY_DIR} REQUIRED + MUJOCO_LIBRARY mujoco mujoco.2.3.4 HINTS ${MUJOCO_LIBRARY_DIR} REQUIRED ) find_path(MUJOCO_INCLUDE mujoco/mujoco.h HINTS ${MUJOCO_INCLUDE_DIR} REQUIRED) message("MuJoCo is at ${MUJOCO_LIBRARY}") diff --git a/python/mujoco/mjpython/Info.plist b/python/mujoco/mjpython/Info.plist index 6618eef0..d08054b9 100644 --- a/python/mujoco/mjpython/Info.plist +++ b/python/mujoco/mjpython/Info.plist @@ -7,13 +7,13 @@ CFBundleIdentifier org.mujoco.mjpython CFBundleVersion - 2.3.3 + 2.3.4 CFBundleGetInfoString - 2.3.3 + 2.3.4 CFBundleLongVersionString - 2.3.3 + 2.3.4 CFBundleShortVersionString - 2.3.3 + 2.3.4 CFBundleExecutable mjpython CFBundleIconFile diff --git a/python/setup.py b/python/setup.py index 1670c7a6..c05e5c99 100644 --- a/python/setup.py +++ b/python/setup.py @@ -32,7 +32,7 @@ from setuptools import setup from setuptools.command import build_ext from setuptools.command import install_scripts -__version__ = '2.3.3' +__version__ = '2.3.4' MUJOCO_CMAKE = 'MUJOCO_CMAKE' MUJOCO_CMAKE_ARGS = 'MUJOCO_CMAKE_ARGS' diff --git a/sample/CMakeLists.txt b/sample/CMakeLists.txt index 8a816966..909a0b89 100644 --- a/sample/CMakeLists.txt +++ b/sample/CMakeLists.txt @@ -24,7 +24,7 @@ set(MSVC_INCREMENTAL_DEFAULT ON) project( mujoco_samples - VERSION 2.3.3 + VERSION 2.3.4 DESCRIPTION "MuJoCo samples binaries" HOMEPAGE_URL "https://mujoco.org" ) diff --git a/simulate/CMakeLists.txt b/simulate/CMakeLists.txt index 18a69f32..0ebc66e8 100644 --- a/simulate/CMakeLists.txt +++ b/simulate/CMakeLists.txt @@ -29,7 +29,7 @@ set(MUJOCO_DEP_VERSION_lodepng project( mujoco_simulate - VERSION 2.3.3 + VERSION 2.3.4 DESCRIPTION "MuJoCo simulate binaries" HOMEPAGE_URL "https://mujoco.org" ) diff --git a/src/engine/engine_support.c b/src/engine/engine_support.c index ae882b26..75c13f76 100644 --- a/src/engine/engine_support.c +++ b/src/engine/engine_support.c @@ -36,8 +36,8 @@ #endif #endif -#define mjVERSION 233 -#define mjVERSIONSTRING "2.3.3" +#define mjVERSION 234 +#define mjVERSIONSTRING "2.3.4" // names of disable flags const char* mjDISABLESTRING[mjNDISABLE] = { diff --git a/unity/Editor/Bindings/MujocoBinaryRetriever.cs b/unity/Editor/Bindings/MujocoBinaryRetriever.cs index 06581fa0..ff42e56d 100644 --- a/unity/Editor/Bindings/MujocoBinaryRetriever.cs +++ b/unity/Editor/Bindings/MujocoBinaryRetriever.cs @@ -37,7 +37,7 @@ public class MujocoBinaryRetriever { if (AssetDatabase.LoadMainAssetAtPath(mujocoPath + "/mujoco.dylib") == null) { File.Copy( "/Applications/MuJoCo.app/Contents/Frameworks" + - "/mujoco.framework/Versions/Current/libmujoco.2.3.3.dylib", + "/mujoco.framework/Versions/Current/libmujoco.2.3.4.dylib", mujocoPath + "/mujoco.dylib"); AssetDatabase.Refresh(); } @@ -45,7 +45,7 @@ public class MujocoBinaryRetriever { if (AssetDatabase.LoadMainAssetAtPath(mujocoPath + "/libmujoco.so") == null) { File.Copy( Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) + - "/.mujoco/mujoco-2.3.3/lib/libmujoco.so.2.3.3", + "/.mujoco/mujoco-2.3.4/lib/libmujoco.so.2.3.4", mujocoPath + "/libmujoco.so"); AssetDatabase.Refresh(); } diff --git a/unity/Runtime/Bindings/MjBindings.cs b/unity/Runtime/Bindings/MjBindings.cs index a76e6231..03eec554 100644 --- a/unity/Runtime/Bindings/MjBindings.cs +++ b/unity/Runtime/Bindings/MjBindings.cs @@ -101,7 +101,7 @@ public const int mjMAXLINEPNT = 1000; public const int mjMAXPLANEGRID = 200; public const bool THIRD_PARTY_MUJOCO_MJXMACRO_H_ = true; public const bool THIRD_PARTY_MUJOCO_MUJOCO_H_ = true; -public const int mjVERSION_HEADER = 233; +public const int mjVERSION_HEADER = 234; // ------------------------------------Enums------------------------------------ diff --git a/unity/package.json b/unity/package.json index cab3ade1..a8b510af 100644 --- a/unity/package.json +++ b/unity/package.json @@ -1,7 +1,7 @@ { "name": "org.mujoco", "displayName": "MuJoCo", - "version": "2.3.3", + "version": "2.3.4", "description": "MuJoCo importer and runtime plug-in", "dependencies": {}, "author": {