razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

v1.2.0 (#1631)

Browse source 
* v1.2.0

* more update versions to v1.2.0
This commit is contained in:
shun-iwasawa 2017-12-11 13:23:11 +09:00 committed by masafumi-inoue
parent dff49a7e39
commit 22412dc1a8
15 changed files with 45 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
appveyor.yml
View file

@ -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

2
doc/how_to_build_linux.md
View file

@ -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

6
doc/how_to_build_macosx.md
View file

@ -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
```

6
doc/how_to_build_macosx_ja.md
View file

@ -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
```

14
doc/how_to_build_win.md
View file

@ -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.

12
doc/how_to_build_win_ja.md
View file

@ -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 も生成されます。

20
toonz/install/SystemVar.ini
View file

@ -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"

2
toonz/sources/CMakeLists.txt
View file

@ -599,5 +599,5 @@ if(BUILD_ENV_APPLE)
$<TARGET_FILE:executable>
)
# 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()

4
toonz/sources/include/tversion.h
View file

@ -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) {

4
toonz/sources/tcleanupper/tcleanupper.cpp
View file

@ -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";

4
toonz/sources/tcomposer/tcomposer.cpp
View file

@ -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";

2
toonz/sources/tconverter/tconverter.cpp
View file

@ -37,7 +37,7 @@ typedef QualifierT<TFilePath> 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";

2
toonz/sources/toonz/CMakeLists.txt
View file

@ -1,4 +1,4 @@
set(VERSION 1.1)
set(VERSION 1.2)
set(MOC_HEADERS
addfilmstripframespopup.h

6
toonz/sources/toonz/main.cpp
View file

@ -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";

2
toonz/sources/toonzqt/dvdialog.cpp
View file

@ -33,7 +33,7 @@
using namespace DVGui;
QString DialogTitle = QObject::tr("OpenToonz 1.1");
QString DialogTitle = QObject::tr("OpenToonz 1.2");
//=============================================================================
namespace {