File tree Expand file tree Collapse file tree 6 files changed +26
-26
lines changed
Expand file tree Collapse file tree 6 files changed +26
-26
lines changed Original file line number Diff line number Diff line change 11* text =auto
2+ # Explicitly declare text files to normalize
3+ * .cpp text
4+ * .h text
5+ * .mm text
6+
7+ # Files with CRLF line endings for Windows
8+ * .sln text eol =crlf
9+ * .vcxproj * text eol =crlf
10+ .appveyor.yml text eol =crlf
11+ * .bat text eol =crlf
12+ * .props text eol =crlf
13+ * .filters text eol =crlf
14+
15+ # Files with LF line endings for Unix-like systems
16+ * .sh text eol =lf
17+
18+ # Binary files (no EOL normalization)
19+ * .png binary
20+ * .jpg binary
Original file line number Diff line number Diff line change @@ -6,56 +6,34 @@ PG_DIR="$( cd "$( dirname "${SCRIPT_DIR}/../../" )" && pwd )"
66
77OF_DIR=" $( cd " $( dirname " ${PG_DIR} /../../../" ) " && pwd ) "
88
9-
109echo " CURRENT_DIR: ${CURRENT_DIR} "
1110echo " SCRIPT_DIR: ${SCRIPT_DIR} "
1211echo " PG_DIR: ${PG_DIR} "
1312
1413echo " ====== OF_DIR: ${OF_DIR} "
15-
16- echo " ====== "
17- # Compile commandline tool
1814cd ${PG_DIR}
1915cd commandLine
20-
2116echo " Building openFrameworks commandLine PG - VS"
2217
23-
2418if [ -z " ${PLATFORM+x} " ]; then
2519 PLATFORM=x64
2620fi
27-
2821if [ -z " ${TOOLSET+x} " ]; then
2922 TOOLSET=v143
3023fi
31-
3224if [ -z " ${CONFIGURATION+x} " ]; then
3325 CONFIGURATION=${CONFIGURATION:- Release}
3426fi
3527
36-
37-
38- pwd
39- ls
40-
41-
42-
4328CURRENT=" $( cd " $( dirname " ${BASH_SOURCE[0]} " ) " && pwd ) "
44-
45-
46- # Check if msbuild is available in PATH
4729if command -v msbuild & > /dev/null; then
4830 echo " msbuild is available, use it directly"
4931 msbuild " commandLine.vcxproj" //p:configuration=${CONFIGURATION} //p:platform=${PLATFORM} //p:PlatformToolset=${TOOLSET}
5032else
5133 echo " msbuild is not available, use the specified path"
52- # VS_BASE_PATH="/c/Program Files/Microsoft Visual Studio/2022/Community"
53- # MSBUILD_PATH="${VS_BASE_PATH}/MSBuild/Current/Bin/MSBuild.exe"
54-
5534 MSBUILD_PATH=" C:\\ Program Files\\ Microsoft Visual Studio\\ 2022\\ Community\\ MSBuild\\ Current\\ Bin\\ MSBuild.exe"
5635 MSSTRING=" //p:configuration=${CONFIGURATION} //p:platform=${PLATFORM} //p:PlatformToolset=${TOOLSET} "
5736 " ${MSBUILD_PATH} " commandLine.sln ${MSSTRING}
58-
5937fi
6038
6139ret=$?
Original file line number Diff line number Diff line change @@ -36,6 +36,7 @@ if [ -f "$SOURCE_FILE" ]; then
3636 cp " $SOURCE_FILE " " $DESTINATION_PATH /projectGenerator.exe"
3737 . " ${SCRIPT_DIR} /secure.sh"
3838 secure " $DESTINATION_PATH /projectGenerator.exe" projectGenerator.pkl
39+ chmod +x $DESTINATION_PATH /projectGenerator.exe
3940 echo " projectGenerator.exe File copied successfully."
4041else
4142 # File does not exist
@@ -52,7 +53,8 @@ npm run
5253echo " ====== run"
5354
5455. " ${SCRIPT_DIR} /secure.sh"
55- secure " ${_DIR} /projectGenerator.exe" projectGenerator.pkl
56+ secure " ${DESTINATION_PATH} /projectGenerator.exe" projectGenerator.pkl
57+ chmod +x $DESTINATION_PATH /projectGenerator.exe
5658
5759# if [ "${BUILD_TEST}" == 1 ]; then
5860 npm run start:prod
Original file line number Diff line number Diff line change @@ -37,6 +37,7 @@ if [ -f "$SOURCE_FILE" ]; then
3737 cp " $SOURCE_FILE " " $DESTINATION_PATH /projectGenerator.exe"
3838 . " ${SCRIPT_DIR} /secure.sh"
3939 secure " $DESTINATION_PATH /projectGenerator.exe" projectGenerator.pkl
40+ chmod +x $DESTINATION_PATH /projectGenerator.exe
4041 echo " projectGenerator.exe File copied successfully."
4142else
4243 # File does not exist
Original file line number Diff line number Diff line change @@ -21,11 +21,11 @@ if [ -d "win-unpacked" ]; then
2121
2222 cd " win-unpacked"
2323
24- _DIR =$( pwd)
24+ DIR =$( pwd)
2525
2626 . " ${SCRIPT_DIR} /secure.sh"
27- secure " {_DIR }/projectGenerator.exe" projectGenerator.pkl
28-
27+ secure " ${DIR } /projectGenerator.exe" projectGenerator.pkl
28+ chmod +x ${DIR} /projectGenerator.exe
2929 zip -r " ../projectGenerator-vs-gui.zip" " ."
3030 pwd
3131 ls
You can’t perform that action at this time.
0 commit comments