From 22412dc1a8b550e3c3a2190f32d1807a5f7ca66a Mon Sep 17 00:00:00 2001 From: shun-iwasawa Date: Dec 11 2017 04:23:11 +0000 Subject: v1.2.0 (#1631) * v1.2.0 * more update versions to v1.2.0 --- diff --git a/appveyor.yml b/appveyor.yml index ebe3727..ab1dab9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -32,12 +32,12 @@ build: verbosity: minimal after_build: - cmd: >- - C:\Qt\5.6\msvc2013_64\bin\windeployqt.exe %CONFIGURATION%\OpenToonz_1.1.exe + C:\Qt\5.6\msvc2013_64\bin\windeployqt.exe %CONFIGURATION%\OpenToonz_1.2.exe copy /Y ..\..\thirdparty\glut\3.7.6\lib\glut64.dll %CONFIGURATION% copy /Y ..\..\thirdparty\glew\glew-1.9.0\bin\64bit\glew32.dll %CONFIGURATION% artifacts: - path: toonz\$(PLATFORM)\$(CONFIGURATION) - name: OpenToonz_1.1 + name: OpenToonz_1.2 diff --git a/doc/how_to_build_linux.md b/doc/how_to_build_linux.md index 9e25b3d..628d367 100644 --- a/doc/how_to_build_linux.md +++ b/doc/how_to_build_linux.md @@ -149,7 +149,7 @@ If you need to debug the application, you should be able to use `cmake -DCMAKE_B You can now run the application: ``` -$ LD_LIBRARY_PATH=./lib/opentoonz:$LD_LIBRARY_PATH ./bin/OpenToonz_1.1 +$ LD_LIBRARY_PATH=./lib/opentoonz:$LD_LIBRARY_PATH ./bin/OpenToonz_1.2 ``` ### Performing a System Installation diff --git a/doc/how_to_build_macosx.md b/doc/how_to_build_macosx.md index b0b7d48..1f443eb 100644 --- a/doc/how_to_build_macosx.md +++ b/doc/how_to_build_macosx.md @@ -39,10 +39,10 @@ git lfs pull ### (Optional) Create the stuff Directory -If the directory `/Applications/OpenToonz/OpenToonz_1.1_stuff` does not exist, enter the following command: +If the directory `/Applications/OpenToonz/OpenToonz_1.2_stuff` does not exist, enter the following command: ``` -$ sudo cp -r stuff /Applications/OpenToonz/OpenToonz_1.1_stuff +$ sudo cp -r stuff /Applications/OpenToonz/OpenToonz_1.2_stuff ``` ### 3. Build tiff in thirdparty @@ -86,5 +86,5 @@ Please be patient as the install will take a while. ### After Building ``` -$ open ./toonz/OpenToonz_1.1.app +$ open ./toonz/OpenToonz_1.2.app ``` diff --git a/doc/how_to_build_macosx_ja.md b/doc/how_to_build_macosx_ja.md index 2e9e462..f0f1ad6 100644 --- a/doc/how_to_build_macosx_ja.md +++ b/doc/how_to_build_macosx_ja.md @@ -29,10 +29,10 @@ $ git clone https://github.com/opentoonz/opentoonz ### stuff ディレクトリの設置 (任意) -`/Applications/OpenToonz/OpenToonz_1.1_stuff` というディレクトリが存在していない場合は以下のコマンド等でリポジトリのひな形を設置する必要があります。 +`/Applications/OpenToonz/OpenToonz_1.2_stuff` というディレクトリが存在していない場合は以下のコマンド等でリポジトリのひな形を設置する必要があります。 ``` -$ sudo cp -r opentoonz/stuff /Applications/OpenToonz/OpenToonz_1.1_stuff +$ sudo cp -r opentoonz/stuff /Applications/OpenToonz/OpenToonz_1.2_stuff ``` ### thirdparty 下の tiff をビルド @@ -67,5 +67,5 @@ $ make ### 完成 ``` -$ open ./toonz/OpenToonz_1.1.app +$ open ./toonz/OpenToonz_1.2.app ``` diff --git a/doc/how_to_build_win.md b/doc/how_to_build_win.md index d7cc68c..3741e5c 100644 --- a/doc/how_to_build_win.md +++ b/doc/how_to_build_win.md @@ -71,8 +71,8 @@ Rename the following files: ### Setting Up the Program's Path 1. Copy the entire contents of `$opentoonz/toonz/build/Release` to an appropriate folder. -2. In the path for `OpenToonz_1.1.exe`, append the Qt program `windeployqt.exe` as an argument. - - The necessary Qt library files should be in the same folder as `OpenToonz_1.1.exe` +2. In the path for `OpenToonz_1.2.exe`, append the Qt program `windeployqt.exe` as an argument. + - The necessary Qt library files should be in the same folder as `OpenToonz_1.2.exe` - These include: - `Qt5Core.dll` - `Qt5Gui.dll` @@ -83,7 +83,7 @@ Rename the following files: - `Qt5Svg.dll` - `Qt5Widgets.dll` - `Qt5Multimedia.dll` - - These files should be in the corresponding folders in the same folder `OpenToonz_1.1.exe` + - These files should be in the corresponding folders in the same folder `OpenToonz_1.2.exe` - `/bearer/qgenericbearer.dll` - `/bearer/qnativewifibearer.dll` - `/iconengines/qsvgicon.dll` @@ -99,11 +99,11 @@ Rename the following files: - `/imageformats/qwebp.dll` - `/platforms/qwindows.dll` -3. Copy the following files to the same folder as `OpenToonz_1.1.exe` +3. Copy the following files to the same folder as `OpenToonz_1.2.exe` - `$opentoonz/thirdparty/glut/3.7.6/lib/glut64.dll` - `$opentoonz/thirdparty/glew/glew-1.9.0/bin/64bit/glew32.dll` -4. Copy the `srv` folder from the previous OpenToonz installation to the same folder as `OpenToonz_1.1.exe` +4. Copy the `srv` folder from the previous OpenToonz installation to the same folder as `OpenToonz_1.2.exe` - If there is no `srv` folder, OpenToonz can still be used. However, various file formats such as `mov` cannot be used. - Creating the files for `srv` is discussed later. @@ -114,10 +114,10 @@ If a previous binary of OpenToonz was already installed, this step and the follo ### Creating Registry Keys 1. Using the registry editor, create the following key and copy the path of the `$opentoonz/stuff` folder from above to it. - - HKEY_LOCAL_MACHINE\SOFTWARE\OpenToonz\OpenToonz\1.1\TOONZROOT + - HKEY_LOCAL_MACHINE\SOFTWARE\OpenToonz\OpenToonz\1.2\TOONZROOT ### Running -`OpenToonz_1.1.exe` can now be run. Congratulations! +`OpenToonz_1.2.exe` can now be run. Congratulations! ## Creating the Files for the `srv` Folder OpenToonz utilizes the QuickTime SDK's `mov` and associated file formats. Since the QuickTime SDK only comes in 32-bit versions, the 32-bit file `t32bitsrv.exe` from the QuickTime SDK is used in both the 64-bit and 32-bit versions of OpenToonz. As a result, the following instructions apply to both the 32 and 64-bit versions of OpenToonz. diff --git a/doc/how_to_build_win_ja.md b/doc/how_to_build_win_ja.md index 73ac9e7..0214fd4 100644 --- a/doc/how_to_build_win_ja.md +++ b/doc/how_to_build_win_ja.md @@ -64,12 +64,12 @@ Visual Studio 2015 と Qt 5.9 でビルドできることを確認していま� ## 実行 ### 実行可能ファイルなどの配置 1. `$oepntoonz/toonz/build/Release` の中身を適当なフォルダにコピーします -2. `OpenToonz_1.1.exe` のパスを引数にして Qt に付属の `windeployqt.exe` を実行します - - 必要な Qt のライブラリなどが `OpenToonz_1.1.exe` と同じフォルダに集められます -3. 下記のファイルを `OpenToonz_1.1.exe` と同じフォルダにコピーします +2. `OpenToonz_1.2.exe` のパスを引数にして Qt に付属の `windeployqt.exe` を実行します + - 必要な Qt のライブラリなどが `OpenToonz_1.2.exe` と同じフォルダに集められます +3. 下記のファイルを `OpenToonz_1.2.exe` と同じフォルダにコピーします - `$opentoonz/thirdparty/glut/3.7.6/lib/glut64.dll` - `$opentoonz/thirdparty/glew/glew-1.9.0/bin/64bit/glew32.dll` -4. バイナリ版の OpenToonz のインストール先にある `srv` フォルダを `OpenToonz_1.1.exe` と同じフォルダにコピーします +4. バイナリ版の OpenToonz のインストール先にある `srv` フォルダを `OpenToonz_1.2.exe` と同じフォルダにコピーします - `srv` が無くても OpenToonz は動作しますが、 mov 形式などに対応できません - `srv` 内のファイルの生成方法は後述します @@ -80,10 +80,10 @@ Visual Studio 2015 と Qt 5.9 でビルドできることを確認していま� ### レジストリキーの作成 1. レジストリエディタで下記のキーを作成し、 Stuff フォルダの作成でコピーした stuff フォルダのパスを記載します - - HKEY_LOCAL_MACHINE\SOFTWARE\OpenToonz\OpenToonz\1.1\TOONZROOT + - HKEY_LOCAL_MACHINE\SOFTWARE\OpenToonz\OpenToonz\1.2\TOONZROOT ### 実行 -OpenToonz_1.1.exe を実行して動作すれば成功です。おめでとうございます。 +OpenToonz_1.2.exe を実行して動作すれば成功です。おめでとうございます。 ## `srv` フォルダ内のファイルの生成 OpenToonz は QuickTime SDK を用いて mov 形式などへ対応しています。 QuickTime SDK は 32 ビット版しかないため、 `t32bitsrv.exe` という 32 ビット版の実行可能ファイルにQuickTime SDKを組み込み、64ビット版の OpenToonz は `t32bitsrv.exe` を経由して QuickTime SDK の機能を使用しています。以下の手順では `t32bitsrv.exe` などと合わせて、 32 ビット版の OpenToonz も生成されます。 diff --git a/toonz/install/SystemVar.ini b/toonz/install/SystemVar.ini index c644e4f..f21022e 100644 --- a/toonz/install/SystemVar.ini +++ b/toonz/install/SystemVar.ini @@ -1,11 +1,11 @@ [General] -TOONZCACHEROOT="/Applications/OpenToonz/OpenToonz_1.1_stuff/cache" -TOONZCONFIG="/Applications/OpenToonz/OpenToonz_1.1_stuff/config" -TOONZFXPRESETS="/Applications/OpenToonz/OpenToonz_1.1_stuff/fxs" -TOONZLIBRARY="/Applications/OpenToonz/OpenToonz_1.1_stuff/library" -TOONZPROFILES="/Applications/OpenToonz/OpenToonz_1.1_stuff/profiles" -OpenToonzPROFILES="/Applications/OpenToonz/OpenToonz_1.1_stuff/profiles" -TOONZPROJECTS="/Applications/OpenToonz/OpenToonz_1.1_stuff/projects" -TOONZROOT="/Applications/OpenToonz/OpenToonz_1.1_stuff" -OPENTOONZROOT="/Applications/OpenToonz/OpenToonz_1.1_stuff" -TOONZSTUDIOPALETTE="/Applications/OpenToonz/OpenToonz_1.1_stuff/studiopalette" +TOONZCACHEROOT="/Applications/OpenToonz/OpenToonz_1.2_stuff/cache" +TOONZCONFIG="/Applications/OpenToonz/OpenToonz_1.2_stuff/config" +TOONZFXPRESETS="/Applications/OpenToonz/OpenToonz_1.2_stuff/fxs" +TOONZLIBRARY="/Applications/OpenToonz/OpenToonz_1.2_stuff/library" +TOONZPROFILES="/Applications/OpenToonz/OpenToonz_1.2_stuff/profiles" +OpenToonzPROFILES="/Applications/OpenToonz/OpenToonz_1.2_stuff/profiles" +TOONZPROJECTS="/Applications/OpenToonz/OpenToonz_1.2_stuff/projects" +TOONZROOT="/Applications/OpenToonz/OpenToonz_1.2_stuff" +OPENTOONZROOT="/Applications/OpenToonz/OpenToonz_1.2_stuff" +TOONZSTUDIOPALETTE="/Applications/OpenToonz/OpenToonz_1.2_stuff/studiopalette" diff --git a/toonz/sources/CMakeLists.txt b/toonz/sources/CMakeLists.txt index 17929d3..0f37a0e 100644 --- a/toonz/sources/CMakeLists.txt +++ b/toonz/sources/CMakeLists.txt @@ -599,5 +599,5 @@ if(BUILD_ENV_APPLE) $ ) # add capability for retina displays - set_target_properties(OpenToonz_1.1 PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/../cmake/BundleInfo.plist.in) + set_target_properties(OpenToonz_1.2 PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/../cmake/BundleInfo.plist.in) endif() diff --git a/toonz/sources/include/tversion.h b/toonz/sources/include/tversion.h index 5bf7205..5cf6c59 100644 --- a/toonz/sources/include/tversion.h +++ b/toonz/sources/include/tversion.h @@ -16,8 +16,8 @@ public: private: const char *applicationName = "OpenToonz"; - const float applicationVersion = 1.1; - const float applicationRevision = 3; + const float applicationVersion = 1.2; + const float applicationRevision = 0; }; std::string ToonzVersion::getAppName(void) { diff --git a/toonz/sources/tcleanupper/tcleanupper.cpp b/toonz/sources/tcleanupper/tcleanupper.cpp index d22a1aa..5066d28 100644 --- a/toonz/sources/tcleanupper/tcleanupper.cpp +++ b/toonz/sources/tcleanupper/tcleanupper.cpp @@ -63,8 +63,8 @@ inline ostream &operator<<(ostream &out, const TFilePath &fp) { namespace { const char *applicationName = "OpenToonz"; -const char *applicationVersion = "1.1"; -const char *applicationFullName = "OpenToonz 1.1"; +const char *applicationVersion = "1.2"; +const char *applicationFullName = "OpenToonz 1.2"; const char *rootVarName = "TOONZROOT"; const char *systemVarPrefix = "TOONZ"; diff --git a/toonz/sources/tcomposer/tcomposer.cpp b/toonz/sources/tcomposer/tcomposer.cpp index 5819453..42ac0cd 100644 --- a/toonz/sources/tcomposer/tcomposer.cpp +++ b/toonz/sources/tcomposer/tcomposer.cpp @@ -104,8 +104,8 @@ namespace { // const char *applicationName = "OpenToonz"; -const char *applicationVersion = "1.1"; -const char *applicationFullName = "OpenToonz 1.1"; +const char *applicationVersion = "1.2"; +const char *applicationFullName = "OpenToonz 1.2"; const char *rootVarName = "TOONZROOT"; const char *systemVarPrefix = "TOONZ"; diff --git a/toonz/sources/tconverter/tconverter.cpp b/toonz/sources/tconverter/tconverter.cpp index 8b437aa..8a71275 100644 --- a/toonz/sources/tconverter/tconverter.cpp +++ b/toonz/sources/tconverter/tconverter.cpp @@ -37,7 +37,7 @@ typedef QualifierT FilePathQualifier; #define RENDER_LICENSE_NOT_FOUND 888 -const char *applicationVersion = "1.1"; +const char *applicationVersion = "1.2"; const char *applicationName = "OpenToonz"; const char *rootVarName = "TOONZROOT"; const char *systemVarPrefix = "TOONZ"; diff --git a/toonz/sources/toonz/CMakeLists.txt b/toonz/sources/toonz/CMakeLists.txt index 50f369d..20a9486 100644 --- a/toonz/sources/toonz/CMakeLists.txt +++ b/toonz/sources/toonz/CMakeLists.txt @@ -1,4 +1,4 @@ -set(VERSION 1.1) +set(VERSION 1.2) set(MOC_HEADERS addfilmstripframespopup.h diff --git a/toonz/sources/toonz/main.cpp b/toonz/sources/toonz/main.cpp index 9c47658..7fa0819 100644 --- a/toonz/sources/toonz/main.cpp +++ b/toonz/sources/toonz/main.cpp @@ -91,14 +91,14 @@ const char *rootVarName = "LINETESTROOT"; const char *systemVarPrefix = "LINETEST"; #else const char *applicationName = "OpenToonz"; -const char *applicationVersion = "1.1"; -const char *applicationRevision = "3"; +const char *applicationVersion = "1.2"; +const char *applicationRevision = "0"; const char *dllRelativePath = "./toonz6.app/Contents/Frameworks"; #endif TEnv::IntVar EnvSoftwareCurrentFontSize("SoftwareCurrentFontSize", 12); -const char *applicationFullName = "OpenToonz 1.1.3"; +const char *applicationFullName = "OpenToonz 1.2"; // to be 1.2.n from 1.2.1 const char *rootVarName = "TOONZROOT"; const char *systemVarPrefix = "TOONZ"; diff --git a/toonz/sources/toonzqt/dvdialog.cpp b/toonz/sources/toonzqt/dvdialog.cpp index 6166f16..3be7d64 100644 --- a/toonz/sources/toonzqt/dvdialog.cpp +++ b/toonz/sources/toonzqt/dvdialog.cpp @@ -33,7 +33,7 @@ using namespace DVGui; -QString DialogTitle = QObject::tr("OpenToonz 1.1"); +QString DialogTitle = QObject::tr("OpenToonz 1.2"); //============================================================================= namespace {