Updated documentation and Jenkins management
This commit is contained in:
parent
fb7ea87b01
commit
93b0bcb335
GPG Key ID:
832E52F4E23F8F24
142
Jenkinsfile
vendored
142
Jenkinsfile
vendored
@ -1,67 +1,77 @@
|
|||||||
pipeline {
|
pipeline {
|
||||||
agent any
|
agent any
|
||||||
options {
|
options {
|
||||||
skipDefaultCheckout(true)
|
skipDefaultCheckout(true)
|
||||||
}
|
}
|
||||||
environment {
|
environment {
|
||||||
CI_OUTPUT_NAME = "RSE_Model"
|
CI_OUTPUT_NAME = "RSE_Texture"
|
||||||
CI_BUILD_NUMBER = "$BUILD_NUMBER"
|
CI_BUILD_NUMBER = "$BUILD_NUMBER"
|
||||||
}
|
}
|
||||||
stages {
|
stages {
|
||||||
stage('Prepare') {
|
stage('Prepare') {
|
||||||
steps {
|
steps {
|
||||||
cleanWs()
|
cleanWs()
|
||||||
}
|
rtConanClient(id: "conan", userHome: "/home/jackcartersmith")
|
||||||
}
|
}
|
||||||
stage('Build') {
|
}
|
||||||
steps {
|
stage('Build') {
|
||||||
parallel(
|
steps {
|
||||||
linux: {
|
parallel(
|
||||||
dir("linux") {
|
linux: {
|
||||||
checkout([$class: 'GitSCM', branches: [[name: '**']], browser: [$class: 'GiteaBrowser', repoUrl: 'https://git.jcsmith.fr/jackcartersmith/RSE-Model.git'], extensions: [], userRemoteConfigs: [[credentialsId: 'jenkins-ssh', url: 'ssh://git@git.jcsmith.fr:2322/JCS-Prod/RSE-Model.git']]])
|
dir("linux") {
|
||||||
cmakeBuild buildDir: 'build', installation: 'latest', steps: [[args: 'all']]
|
checkout([$class: 'GitSCM', branches: [[name: '**']], browser: [$class: 'GiteaBrowser', repoUrl: 'https://git.jcsmith.fr/JCS-Prod/RSE-Texture'], extensions: [], userRemoteConfigs: [[credentialsId: 'jenkins-ssh', url: 'ssh://git@git.jcsmith.fr:2322/JCS-Prod/RSE-Texture.git']]])
|
||||||
}
|
dir("build") {
|
||||||
},
|
rtConanRun(clientId: "conan", command: "install .. --build missing")
|
||||||
windows: {
|
}
|
||||||
dir("windows") {
|
cmakeBuild buildDir: 'build', installation: 'latest', steps: [[args: 'all']]
|
||||||
checkout([$class: 'GitSCM', branches: [[name: '**']], browser: [$class: 'GiteaBrowser', repoUrl: 'https://git.jcsmith.fr/jackcartersmith/RSE-Model.git'], extensions: [], userRemoteConfigs: [[credentialsId: 'jenkins-ssh', url: 'ssh://git@git.jcsmith.fr:2322/JCS-Prod/RSE-Model.git']]])
|
}
|
||||||
cmakeBuild buildDir: 'build', cmakeArgs: '-DGNU_HOST=x86_64-w64-mingw32 -DCMAKE_TOOLCHAIN_FILE=../mingw_cross_toolchain.cmake -D"ZLIB_INCLUDE_DIR=/mnt/cc-libs/mingw64/zlib/1.2.11/include" -D"ZLIB_LIBRARY=/mnt/cc-libs/mingw64/zlib/1.2.11/lib/libzlib.dll.a" -D"PNG_PNG_INCLUDE_DIR=/mnt/cc-libs/mingw64/libpng/1.6.37/include" -D"PNG_LIBRARY=/mnt/cc-libs/mingw64/libpng/1.6.37/lib/libpng.dll.a"', installation: 'latest', steps: [[args: 'all']]
|
},
|
||||||
}
|
windows: {
|
||||||
}
|
dir("windows") {
|
||||||
)
|
checkout([$class: 'GitSCM', branches: [[name: '**']], browser: [$class: 'GiteaBrowser', repoUrl: 'https://git.jcsmith.fr/JCS-Prod/RSE-Texture'], extensions: [], userRemoteConfigs: [[credentialsId: 'jenkins-ssh', url: 'ssh://git@git.jcsmith.fr:2322/JCS-Prod/RSE-Texture.git']]])
|
||||||
}
|
dir("build") {
|
||||||
}
|
rtConanRun(clientId: "conan", command: "install .. --profile windows --build missing")
|
||||||
stage('Deploy') {
|
}
|
||||||
steps {
|
cmakeBuild buildDir: 'build', cmakeArgs: '-DGNU_HOST=x86_64-w64-mingw32 -DCMAKE_TOOLCHAIN_FILE=../mingw_cross_toolchain.cmake', installation: 'latest', steps: [[args: 'all']]
|
||||||
dir("zip_linux") {
|
}
|
||||||
sh 'cp ../linux/build/${CI_OUTPUT_NAME}-1.0.1.${BUILD_NUMBER}* .'
|
}
|
||||||
}
|
)
|
||||||
dir("zip_win") {
|
}
|
||||||
sh 'cp ../windows/build/${CI_OUTPUT_NAME}-1.0.1.${BUILD_NUMBER}* /mnt/cc-libs/mingw64/zlib/1.2.11/bin/libzlib.dll /mnt/cc-libs/mingw64/libpng/1.6.37/bin/libpng16.dll .'
|
}
|
||||||
}
|
stage('Deploy') {
|
||||||
zip archive: false, dir: 'zip_linux', exclude: '', glob: '', zipFile: 'x64.zip'
|
steps {
|
||||||
sh 'mv x64.zip ${CI_OUTPUT_NAME}-1.0.1.${BUILD_NUMBER}_x64.zip'
|
dir("zip_linux") {
|
||||||
zip archive: false, dir: 'zip_win', exclude: '', glob: '', zipFile: 'mingw64.zip'
|
sh 'cp ../linux/build/${CI_OUTPUT_NAME}-1.0.1.${BUILD_NUMBER}* .'
|
||||||
sh 'mv mingw64.zip ${CI_OUTPUT_NAME}-1.0.1.${BUILD_NUMBER}_mingw64.zip'
|
}
|
||||||
}
|
dir("zip_win") {
|
||||||
}
|
sh 'cp ../windows/build/${CI_OUTPUT_NAME}-1.0.1.${BUILD_NUMBER}* ../windows/build/*.dll .'
|
||||||
stage('Sign') {
|
}
|
||||||
steps {
|
zip archive: false, dir: 'zip_linux', exclude: '', glob: '', zipFile: 'x64.zip'
|
||||||
sh 'ls -l'
|
sh 'mv x64.zip ${CI_OUTPUT_NAME}-1.0.1.${BUILD_NUMBER}_x64.zip'
|
||||||
sh 'gpg --batch --detach-sign -o ${CI_OUTPUT_NAME}-1.0.1.${BUILD_NUMBER}_x64.zip.gpg ${CI_OUTPUT_NAME}-1.0.1.${BUILD_NUMBER}_x64.zip'
|
zip archive: false, dir: 'zip_win', exclude: '', glob: '', zipFile: 'mingw64.zip'
|
||||||
sh 'gpg --batch --detach-sign -o ${CI_OUTPUT_NAME}-1.0.1.${BUILD_NUMBER}_mingw64.zip.gpg ${CI_OUTPUT_NAME}-1.0.1.${BUILD_NUMBER}_mingw64.zip'
|
sh 'mv mingw64.zip ${CI_OUTPUT_NAME}-1.0.1.${BUILD_NUMBER}_mingw64.zip'
|
||||||
archiveArtifacts(artifacts: '*.zip,*.gpg')
|
archiveArtifacts(artifacts: '*.zip')
|
||||||
}
|
fingerprint(targets: '*.zip')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/*
|
stage('Sign') {
|
||||||
post {
|
steps {
|
||||||
always {
|
sh 'ls -l'
|
||||||
cleanWs(cleanWhenNotBuilt: false,
|
sh 'gpg --batch --detach-sign -o ${CI_OUTPUT_NAME}-1.0.1.${BUILD_NUMBER}_x64.zip.gpg ${CI_OUTPUT_NAME}-1.0.1.${BUILD_NUMBER}_x64.zip'
|
||||||
deleteDirs: true,
|
sh 'gpg --batch --detach-sign -o ${CI_OUTPUT_NAME}-1.0.1.${BUILD_NUMBER}_mingw64.zip.gpg ${CI_OUTPUT_NAME}-1.0.1.${BUILD_NUMBER}_mingw64.zip'
|
||||||
disableDeferredWipeout: true,
|
archiveArtifacts(artifacts: '*.gpg')
|
||||||
notFailBuild: true)
|
fingerprint(targets: '*.gpg')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
*/
|
}
|
||||||
|
/*
|
||||||
|
post {
|
||||||
|
always {
|
||||||
|
cleanWs(cleanWhenNotBuilt: false,
|
||||||
|
deleteDirs: true,
|
||||||
|
disableDeferredWipeout: true,
|
||||||
|
notFailBuild: true)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
55
README.md
55
README.md
@ -7,8 +7,57 @@ The collection consist of few independants modules, each of them deals with spec
|
|||||||
|
|
||||||
All modules are independants. This is the **'MODEL'** module.
|
All modules are independants. This is the **'MODEL'** module.
|
||||||
|
|
||||||
:exclamation: **Master branch is ugly for now and should not be used, please take only released versions.** :exclamation:
|
|
||||||
|
|
||||||
## MODEL MODULE
|
## MODEL MODULE
|
||||||
|
|
||||||
It's extract texture datas from Rogue Squadron 3D (PC) game models files (HOB).
|
It's extract texture datas from Rogue Squadron 3D (PC) game models files (HOB).
|
||||||
|
|
||||||
|
This module can do:
|
||||||
|
- Extract objects inside HOB files to Wavefront OBJ format,
|
||||||
|
- Extract automatically inside subfolder (usefull when you have multiples objects to extract),
|
||||||
|
- Multiple inputs files.
|
||||||
|
|
||||||
|
## TODO
|
||||||
|
|
||||||
|
- Add textures to models.
|
||||||
|
- Discover all unknow fields, animation, bones mesh, etc.
|
||||||
|
|
||||||
|
### Using
|
||||||
|
|
||||||
|
`RSE-Model_"version" [options] <hob files...>` or you can simply drag&drop HOB files on it.
|
||||||
|
|
||||||
|
A futur main program can extract all HOB files directly from DAT file.
|
||||||
|
Due to issue with copyrights, I can't provide samples... You need to extract HOB files yourself.
|
||||||
|
|
||||||
|
<img src="https://repo.jcsmith.fr/pictures/rse-model.gif" width="620" height="400" />
|
||||||
|
|
||||||
|
### Options
|
||||||
|
|
||||||
|
- -h Print this message
|
||||||
|
- -v Activate verbose output
|
||||||
|
- -no-subdir Extract textures directly inside current folder
|
||||||
|
|
||||||
|
### Dependencies
|
||||||
|
|
||||||
|
- obj-lib: as obj file exporter. (https://github.com/rlk/obj)
|
||||||
|
|
||||||
|
### Compiling
|
||||||
|
|
||||||
|
You can compile on both Windows (MinGW) or native Linux system thanks to CMake.
|
||||||
|
|
||||||
|
To compile, just clone and launch cmake:
|
||||||
|
|
||||||
|
```shell
|
||||||
|
cmake .
|
||||||
|
make
|
||||||
|
make install
|
||||||
|
```
|
||||||
|
|
||||||
|
We can also use cross-compilation (after installing `mingw64` and `cmake` packages on your distrib):
|
||||||
|
|
||||||
|
```shell
|
||||||
|
mkdir build && cd build
|
||||||
|
cmake -DGNU_HOST=x86_64-w64-mingw32 \
|
||||||
|
-DCMAKE_TOOLCHAIN_FILE=../mingw_cross_toolchain.cmake \
|
||||||
|
..
|
||||||
|
cmake --build .
|
||||||
|
```
|
||||||
Loading…
x
Reference in New Issue
Block a user