diff --git a/.gitignore b/.gitignore
index 7031631..0c48699 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,6 @@
UnityProject/Temp
UnityProject/obj
UnityProject/.idea
+bin
+setup/setup/obj
+UnityProject/.idea
diff --git a/Jenkinsfile b/Jenkinsfile
index ee4c9ee..1c1ea6f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,6 +1,7 @@
pipeline {
agent any
environment {
+ APP_NAME = "SoundVision"
RUBY = "C:\\Ruby25-x64\\bin\\u3d"
MXBUILD = "\"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\MSBuild\\15.0\\Bin\\MSBuild.exe\""
}
@@ -9,10 +10,10 @@ pipeline {
steps{
echo 'Generate Build Number File'
- writeFile file: 'doublespace/Assets/Resources/buildNumber.txt', text: "${BUILD_NUMBER}"
+ writeFile file: 'UnityProject/Assets/Resources/buildNumber.txt', text: "${BUILD_NUMBER}"
echo 'Building Unity Project'
- bat "${RUBY} run -u 2018.4.3f1 -r -- -batchmode -nographics -quit -projectPath '${workspace}\\doublespace' -executeMethod AppBuilder.Build"
+ bat "${RUBY} run -u 2018.4.3f1 -r -- -batchmode -nographics -quit -projectPath '${workspace}\\UnityProject' -executeMethod AppBuilder.Build"
echo 'Stash unity build'
stash includes: 'bin/**/*', name: 'unity build'
}
@@ -28,9 +29,9 @@ pipeline {
echo 'Build Installer'
unstash 'unity build'
- bat "${MXBUILD} .\\setup\\setup.sln /property:Configuration=Release"
-
- stash includes: 'doublespace.msi', name: 'installer build'
+ bat "${MXBUILD} .\\setup\\setup.sln /property:Configuration=Release"
+
+ stash includes: '${SoundVision}.msi', name: 'installer build'
}
}
stage('Publish')
@@ -39,7 +40,7 @@ pipeline {
echo 'publish Build'
unstash 'installer build'
- cifsPublisher(publishers: [[configName: 'Interstellar Share', transfers: [[cleanRemote: false, excludes: '', flatten: false, makeEmptyDirs: false, noDefaultExcludes: false, patternSeparator: '[, ]+', remoteDirectory: 'Build${BUILD_NUMBER}', remoteDirectorySDF: false, removePrefix: '', sourceFiles: 'doublespace.msi']], usePromotionTimestamp: false, useWorkspaceInPromotion: false, verbose: true]])
+ cifsPublisher(publishers: [[configName: 'Interstellar Share', transfers: [[cleanRemote: false, excludes: '', flatten: false, makeEmptyDirs: false, noDefaultExcludes: false, patternSeparator: '[, ]+', remoteDirectory: 'Build${BUILD_NUMBER}', remoteDirectorySDF: false, removePrefix: '', sourceFiles: '${SoundVision}.msi']], usePromotionTimestamp: false, useWorkspaceInPromotion: false, verbose: true]])
}
}
}
diff --git a/UnityProject/ProjectSettings/GraphicsSettings.asset b/UnityProject/ProjectSettings/GraphicsSettings.asset
index cd1c3d6..1a6b7d1 100644
--- a/UnityProject/ProjectSettings/GraphicsSettings.asset
+++ b/UnityProject/ProjectSettings/GraphicsSettings.asset
@@ -36,6 +36,8 @@ GraphicsSettings:
- {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 10783, guid: 0000000000000000f000000000000000, type: 0}
+ - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
+ - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
m_PreloadedShaders: []
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
type: 0}
diff --git a/UnityProject/ProjectSettings/ProjectSettings.asset b/UnityProject/ProjectSettings/ProjectSettings.asset
index 644fd87..210d654 100644
--- a/UnityProject/ProjectSettings/ProjectSettings.asset
+++ b/UnityProject/ProjectSettings/ProjectSettings.asset
@@ -12,8 +12,8 @@ PlayerSettings:
targetDevice: 2
useOnDemandResources: 0
accelerometerFrequency: 60
- companyName: DefaultCompany
- productName: CylVision
+ companyName: Chikashi Miyama
+ productName: SoundVision
defaultCursor: {fileID: 0}
cursorHotspot: {x: 0, y: 0}
m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
diff --git a/UnityProject/ProjectSettings/UnityConnectSettings.asset b/UnityProject/ProjectSettings/UnityConnectSettings.asset
index fa0b146..c3ae9a0 100644
--- a/UnityProject/ProjectSettings/UnityConnectSettings.asset
+++ b/UnityProject/ProjectSettings/UnityConnectSettings.asset
@@ -4,7 +4,7 @@
UnityConnectSettings:
m_ObjectHideFlags: 0
serializedVersion: 1
- m_Enabled: 0
+ m_Enabled: 1
m_TestMode: 0
m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events
m_EventUrl: https://cdp.cloud.unity3d.com/v1/events
diff --git a/setup/setup.sln b/setup/setup.sln
index 8b55153..274f4c5 100644
--- a/setup/setup.sln
+++ b/setup/setup.sln
@@ -7,12 +7,23 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "setup", "setup\setup.wixpro
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|ia64 = Debug|ia64
+ Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
+ Release|ia64 = Release|ia64
+ Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {B74E8014-72CB-4D0C-85AD-E9AE49A3FC7D}.Debug|ia64.ActiveCfg = Debug|ia64
+ {B74E8014-72CB-4D0C-85AD-E9AE49A3FC7D}.Debug|ia64.Build.0 = Debug|ia64
+ {B74E8014-72CB-4D0C-85AD-E9AE49A3FC7D}.Debug|x64.ActiveCfg = Debug|x86
{B74E8014-72CB-4D0C-85AD-E9AE49A3FC7D}.Debug|x86.ActiveCfg = Debug|x86
{B74E8014-72CB-4D0C-85AD-E9AE49A3FC7D}.Debug|x86.Build.0 = Debug|x86
+ {B74E8014-72CB-4D0C-85AD-E9AE49A3FC7D}.Release|ia64.ActiveCfg = Release|ia64
+ {B74E8014-72CB-4D0C-85AD-E9AE49A3FC7D}.Release|ia64.Build.0 = Release|ia64
+ {B74E8014-72CB-4D0C-85AD-E9AE49A3FC7D}.Release|x64.ActiveCfg = Release|x64
+ {B74E8014-72CB-4D0C-85AD-E9AE49A3FC7D}.Release|x64.Build.0 = Release|x64
{B74E8014-72CB-4D0C-85AD-E9AE49A3FC7D}.Release|x86.ActiveCfg = Release|x86
{B74E8014-72CB-4D0C-85AD-E9AE49A3FC7D}.Release|x86.Build.0 = Release|x86
EndGlobalSection
diff --git a/setup/setup/setup.wixproj b/setup/setup/setup.wixproj
index a72278c..1a6baa5 100644
--- a/setup/setup/setup.wixproj
+++ b/setup/setup/setup.wixproj
@@ -6,20 +6,38 @@
3.10
b74e8014-72cb-4d0c-85ad-e9ae49a3fc7d
2.0
- setup
+ SoundVision
Package
bin\$(Configuration)\
obj\$(Configuration)\
- Debug
+ Debug;UnityBuildDir=../../bin
bin\$(Configuration)\
obj\$(Configuration)\
+ UnityBuildDir=../../bin
+
+
+ Debug;UnityBuildDir=../../bin
+ bin\$(Platform)\$(Configuration)\
+ obj\$(Platform)\$(Configuration)\
+
+
+ bin\$(Platform)\$(Configuration)\
+ obj\$(Platform)\$(Configuration)\
+ UnityBuildDir=../../bin
+
+
+
+
+ $(WixExtDir)\WixUIExtension.dll
+ WixUIExtension
+
diff --git a/setup/setup/source.wxs b/setup/setup/source.wxs
new file mode 100644
index 0000000..f8f1fa7
--- /dev/null
+++ b/setup/setup/source.wxs
@@ -0,0 +1,552 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file