Merge pull request #672 from subutai-io/dev

renaming
subutai-io · Feb 28, 2018 · e38d27f · e38d27f
2 parents fc5fee0 + 2796a32
commit e38d27f
Show file tree

Hide file tree

Showing 36 changed files with 166 additions and 340 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,7 @@
 *.swp
 bin/*
 subutai_tray_bin/
+subutai_control_center_bin/
 libssh_app_bin/
 .DS_Store
 build
@@ -17,6 +18,7 @@ build
 debian/debhelper-build-stamp
 debian/files
 debian/subutai-tray
+debian/subutai-control-center
 deb-packages/deb-packages-internal/debian/changelog
 
 # doxygen
@@ -27,6 +29,7 @@ html/
 darwin-packages/flat/*
 darwin-packages/root/*
 darwin-packages/SubutaiTray.app
+darwin-packages/SubutraiControlCenter.app
 darwin-packages/*.pkg
 
 Makefile

diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,9 @@
 # Change Log
 
+## [6.7.0] 2/26/2018
+* New feature File Transfer System.
+* Fixed minor bugs.
+
 ## [6.6.4] 2/16/2018
 
 * Remote Desktop from Hub bug fixed

diff --git a/Info.plist b/Info.plist
@@ -13,9 +13,9 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleExecutable</key>
-	<string>SubutaiTray</string>
+	<string>SubutaiControlCenter</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.subutai-io.SubutaiTray</string>
+	<string>com.subutai-io.SubutaiControlCenter</string>
 	<key>LSUIElement</key>
 	<string>1</string>
 </dict>

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -14,14 +14,14 @@ try {
 
             build_path_linux = "home/builder/build_master"
             linux_tray_build = "build_master.sh"
-            upload_deb = "subutai-tray-master.deb"
-            upload_sh = "SubutaiTray"
+            upload_deb = "subutai-control-center-master.deb"
+            upload_sh = "SubutaiControlCenter"
             upload_script = "upload_master.sh"
 			upload_script_prod ="upload_prod.sh"
 
             build_mac = "master"
-            upload_pkg = "subutai-tray-master.pkg"
-            upload_osx = "SubutaiTray_osx"
+            upload_pkg = "subutai-control-center-master.pkg"
+            upload_osx = "SubutaiControlCenter_osx"
 
             break;
 	    	default: 
@@ -33,14 +33,14 @@ try {
 
             build_path_linux = "home/builder/build_dev"
             linux_tray_build = "./build_dev.sh"
-            upload_deb = "subutai-tray-dev.deb"
-            upload_sh = "SubutaiTray"
+            upload_deb = "subutai-control-center-dev.deb"
+            upload_sh = "SubutaiControlCenter"
             upload_script = "upload_dev.sh"
 			upload_script_prod ="upload_prod.sh"
 
             build_mac = "dev"
-            upload_pkg = "subutai-tray-dev.pkg"
-            upload_osx = "SubutaiTray_osx"
+            upload_pkg = "subutai-control-center-dev.pkg"
+            upload_osx = "SubutaiControlCenter_osx"
     }
 	/* Building agent binary.
 	Node block used to separate agent and subos code.
@@ -60,9 +60,9 @@ try {
 		notifyBuildDetails = "\nFailed on Stage - Upload"
 
 		sh """
-		/Users/dev/upload/./${upload_script} /Users/dev/SRC/tray/subutai_tray_bin/${upload_pkg}
-		/Users/dev/upload/./${upload_script} /Users/dev/SRC/tray/subutai_tray_bin/${upload_osx}
-		/Users/dev/upload/./${upload_script_prod} /Users/dev/SRC/tray/subutai_tray_bin/${upload_pkg}
+		/Users/dev/upload/./${upload_script} /Users/dev/SRC/tray/subutai_control_center_bin/${upload_pkg}
+		/Users/dev/upload/./${upload_script} /Users/dev/SRC/tray/subutai_control_center_bin/${upload_osx}
+		/Users/dev/upload/./${upload_script_prod} /Users/dev/SRC/tray/subutai_control_center_bin/${upload_pkg}
 		"""
 
 	}

diff --git a/SubutaiTray.exe.manifest → SubutaiControlCenter.exe.manifest b/SubutaiTray.exe.manifest → SubutaiControlCenter.exe.manifest
@@ -2,7 +2,7 @@
 
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
 
-	<assemblyIdentity version="6.6.0.0" processorArchitecture="ia64"	name="SubutaiTray.myapp" type="win32" />
+	<assemblyIdentity version="6.7.0.0" processorArchitecture="ia64"	name="SubutaiControlCenter.myapp" type="win32" />
 
 		<description> This application allows non technical users to manage their containers and see information about their environments, peers, balance etc. </description>
 
@@ -15,4 +15,4 @@
 		</requestedPrivileges>
 	</security>
 </trustInfo>
-</assembly>
+</assembly>
diff --git a/SubutaiTray.pro → SubutaiControlCenter.pro b/SubutaiTray.pro → SubutaiControlCenter.pro
@@ -11,7 +11,7 @@ CONFIG   += c++11
 
 greaterThan(QT_MAJOR_VERSION, 4) : QT += widgets
 
-TARGET = SubutaiTray
+TARGET = SubutaiControlCenter
 TEMPLATE = app
 
 INCLUDEPATH += commons/include

diff --git a/build_linux.sh b/build_linux.sh
@@ -1,16 +1,16 @@
 #!/bin/bash
 nproc_count="$(nproc)"
 core_number=$((nproc_count*2+1))
-subutai_tray_bin="subutai_tray_bin"
+subutai_control_center_bin="subutai_control_center_bin"
 
-if [ -d "$subutai_tray_bin" ]; then 
-	echo "Try to remove subutai_tray_bin"
-  rm -rf subutai_tray_bin
+if [ -d "$subutai_control_center_bin" ]; then 
+	echo "Try to remove subutai_control_center_bin"
+  rm -rf subutai_control_center_bin
 fi 
-mkdir subutai_tray_bin
-cd subutai_tray_bin
-lrelease ../SubutaiTray.pro
-qmake ../SubutaiTray.pro -r -spec linux-g++
+mkdir subutai_control_center_bin
+cd subutai_control_center_bin
+lrelease ../SubutaiControlCenter.pro
+qmake ../SubutaiControlCenter.pro -r -spec linux-g++
 make -j$core_number 
 rm *.o *.cpp *.h
 mv ../*.qm .

diff --git a/build_mac.sh b/build_mac.sh
@@ -1,20 +1,20 @@
 #!/bin/bash
-build="subutai_tray_bin"
+build="subutai_control_center_bin"
 
 if [ -d "$build" ]; then 
 	echo "Try to remove build"
   rm -rf $build
 fi
 mkdir -p $build
 cd $build
-lrelease ../SubutaiTray.pro
-qmake ../SubutaiTray.pro -r -spec macx-clang CONFIG+=x86_64
+lrelease ../SubutaiControlCenter.pro
+qmake ../SubutaiControlCenter.pro -r -spec macx-clang CONFIG+=x86_64
 make 
 mv ../*.qm .
 cd ../
-macdeployqt subutai_tray_bin/SubutaiTray.app
-cd subutai_tray_bin/SubutaiTray.app/Contents/MacOS/
+macdeployqt subutai_control_center_bin/SubutaiControlCenter.app
+cd subutai_control_center_bin/SubutaiControlCenter.app/Contents/MacOS/
 cp ../../../*.qm .
 #source ../../../../after_build_step_mac_os 
-cp SubutaiTray SubutaiTray_osx
-cp SubutaiTray_osx ../../../.
+cp SubutaiControlCenter SubutaiControlCenter_osx
+cp SubutaiControlCenter_osx ../../../.
diff --git a/build_win.bat b/build_win.bat
@@ -1,29 +1,29 @@
 set arg_vboxrt_dll=%1
 
-if exist "subutai_tray_bin" (
+if exist "subutai_control_center_bin" (
 
-  echo "Try to remove subutai_tray_bin"
+  echo "Try to remove subutai_control_center_bin"
 
-   rd /Q /S "subutai_tray_bin"
+   rd /Q /S "subutai_control_center_bin"
 
 )
 
 
 
-md subutai_tray_bin
+md subutai_control_center_bin
 
-cd subutai_tray_bin
+cd subutai_control_center_bin
 
-qmake ..\SubutaiTray.pro -r -spec win32-msvc
+qmake ..\SubutaiControlCenter.pro -r -spec win32-msvc
 
 jom
 
 cd ..
 
-copy "libssh2\lib\win32\libssh2.dll" "subutai_tray_bin\release\"
+copy "libssh2\lib\win32\libssh2.dll" "subutai_control_center_bin\release\"
 
 
-cd subutai_tray_bin\release
+cd subutai_control_center_bin\release
 
 del *.obj
 
@@ -33,7 +33,7 @@ del *.h
 
 del *.moc
 
-windeployqt --release --no-translations --compiler-runtime SubutaiTray.exe
+windeployqt --release --no-translations --compiler-runtime SubutaiControlCenter.exe
 
 copy %arg_vboxrt_dll% . && echo "SUCCESS"