ci: big changes to the builds v11

MRKonrad · MRKonrad · commit 1b619a75151e · 2019-11-01T12:50:53.000+01:00
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -76,9 +76,9 @@ after_build:
   - mkdir deployment
   # zip the files for the deployment
   - cd %APPVEYOR_BUILD_FOLDER%\opensource_install
-  - 7z a %OPENSOURCE_EXTENDED_NAME%.zip bin\* lib\TomatoLib* include\*  # zip
+  - 7z a %OPENSOURCE_EXTENDED_NAME%.zip bin\* lib\* include\*  # zip
   - cd %APPVEYOR_BUILD_FOLDER%\full_install
-  - 7z a %FULL_EXTENDED_NAME%.zip bin\* lib\TomatoLib* include\*  # zip
+  - 7z a %FULL_EXTENDED_NAME%.zip bin\* lib\* include\*  # zip
   # copy the files for the deployment
   - copy %APPVEYOR_BUILD_FOLDER%\opensource_install\%OPENSOURCE_EXTENDED_NAME%.zip %APPVEYOR_BUILD_FOLDER%\deployment\%OPENSOURCE_EXTENDED_NAME%.zip
   - copy %APPVEYOR_BUILD_FOLDER%\full_install\%FULL_EXTENDED_NAME%.zip %APPVEYOR_BUILD_FOLDER%\deployment\%FULL_EXTENDED_NAME%.zip
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -177,7 +177,8 @@ endif()
 
 install (TARGETS TomatoLib
             RUNTIME DESTINATION bin
-            LIBRARY DESTINATION lib)
+            LIBRARY DESTINATION lib
+            ARCHIVE DESTINATION lib)
 install (FILES ${API_FILES} DESTINATION include) # headers
 if(BUILD_APP)
     install (TARGETS TomatoExe DESTINATION bin)
diff --git a/app/OxFactoryOfCalculators.h b/app/OxFactoryOfCalculators.h
@@ -78,7 +78,7 @@ namespace Ox {
         static void disp(int parameter_to_map = -1){
 
             if (parameter_to_map >= 0) {
-                printf("%-30s%-20s", " parameter_to_map: ", calculatorsTypeNames[parameter_to_map]);
+                printf("%-28s%-22s", " parameter_to_map: ", calculatorsTypeNames[parameter_to_map]);
             }
 
             printf("options: [ ");
diff --git a/app/OxFactoryOfFitters.h b/app/OxFactoryOfFitters.h
@@ -103,7 +103,7 @@ namespace Ox {
         static void disp(int fitting_method = -1){
 
             if (fitting_method >= 0) {
-                printf("%-30s%-20s", " fitting_method: ", fittersTypeNames[fitting_method]);
+                printf("%-28s%-22s", " fitting_method: ", fittersTypeNames[fitting_method]);
             }
 
             printf("options: [ ");
diff --git a/app/OxFactoryOfFunctions.h b/app/OxFactoryOfFunctions.h
@@ -70,7 +70,7 @@ namespace Ox {
         static void disp(int functions_type = -1){
 
             if (functions_type >= 0) {
-                printf("%-30s%-20s", " functions_type: ", functionsTypeNames[functions_type]);
+                printf("%-28s%-22s", " functions_type: ", functionsTypeNames[functions_type]);
             }
 
             printf("options: [ ");
diff --git a/app/OxFactoryOfSignCalculators.h b/app/OxFactoryOfSignCalculators.h
@@ -68,7 +68,7 @@ namespace Ox {
         static void disp(int sign_calc_method = -1){
 
             if (sign_calc_method >= 0) {
-                printf("%-30s%-20s", " sign_calc_method: ", signCalculatorsTypeNames[sign_calc_method]);
+                printf("%-28s%-22s", " sign_calc_method: ", signCalculatorsTypeNames[sign_calc_method]);
             }
 
             printf("options: [ ");
diff --git a/app/OxFactoryOfStartPointCalculators.h b/app/OxFactoryOfStartPointCalculators.h
@@ -70,7 +70,7 @@ namespace Ox {
         static void disp(int start_point_calc_method = -1){
 
             if (start_point_calc_method >= 0) {
-                printf("%-30s%-20s", " start_point_calc_method: ", startPointCalculatorsTypeNames[start_point_calc_method]);
+                printf("%-28s%-22s", " start_point_calc_method: ", startPointCalculatorsTypeNames[start_point_calc_method]);
             }
 
             printf("options: [ ");

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ namespace Ox {`
`78`	`78`	`static void disp(int parameter_to_map = -1){`
`79`	`79`
`80`	`80`	`if (parameter_to_map >= 0) {`
`81`		`- printf("%-30s%-20s", " parameter_to_map: ", calculatorsTypeNames[parameter_to_map]);`
	`81`	`+ printf("%-28s%-22s", " parameter_to_map: ", calculatorsTypeNames[parameter_to_map]);`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`printf("options: [ ");`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ namespace Ox {`
`103`	`103`	`static void disp(int fitting_method = -1){`
`104`	`104`
`105`	`105`	`if (fitting_method >= 0) {`
`106`		`- printf("%-30s%-20s", " fitting_method: ", fittersTypeNames[fitting_method]);`
	`106`	`+ printf("%-28s%-22s", " fitting_method: ", fittersTypeNames[fitting_method]);`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`printf("options: [ ");`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ namespace Ox {`
`70`	`70`	`static void disp(int functions_type = -1){`
`71`	`71`
`72`	`72`	`if (functions_type >= 0) {`
`73`		`- printf("%-30s%-20s", " functions_type: ", functionsTypeNames[functions_type]);`
	`73`	`+ printf("%-28s%-22s", " functions_type: ", functionsTypeNames[functions_type]);`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`printf("options: [ ");`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ namespace Ox {`
`68`	`68`	`static void disp(int sign_calc_method = -1){`
`69`	`69`
`70`	`70`	`if (sign_calc_method >= 0) {`
`71`		`- printf("%-30s%-20s", " sign_calc_method: ", signCalculatorsTypeNames[sign_calc_method]);`
	`71`	`+ printf("%-28s%-22s", " sign_calc_method: ", signCalculatorsTypeNames[sign_calc_method]);`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`printf("options: [ ");`