Skip to content

Commit 0d8b8d2

Browse files
authored
chmod fixes windows (#599)
* chmod fixes windows * Set executable permissions for all .sh files
1 parent 0d4e7c3 commit 0d8b8d2

File tree

6 files changed

+26
-26
lines changed

6 files changed

+26
-26
lines changed

.gitattributes

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,20 @@
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

scripts/vs/build_cmdline.sh

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,56 +6,34 @@ PG_DIR="$( cd "$( dirname "${SCRIPT_DIR}/../../" )" && pwd )"
66

77
OF_DIR="$( cd "$( dirname "${PG_DIR}/../../../" )" && pwd )"
88

9-
109
echo "CURRENT_DIR: ${CURRENT_DIR}"
1110
echo "SCRIPT_DIR: ${SCRIPT_DIR}"
1211
echo "PG_DIR: ${PG_DIR}"
1312

1413
echo "====== OF_DIR: ${OF_DIR}"
15-
16-
echo "====== "
17-
# Compile commandline tool
1814
cd ${PG_DIR}
1915
cd commandLine
20-
2116
echo "Building openFrameworks commandLine PG - VS"
2217

23-
2418
if [ -z "${PLATFORM+x}" ]; then
2519
PLATFORM=x64
2620
fi
27-
2821
if [ -z "${TOOLSET+x}" ]; then
2922
TOOLSET=v143
3023
fi
31-
3224
if [ -z "${CONFIGURATION+x}" ]; then
3325
CONFIGURATION=${CONFIGURATION:-Release}
3426
fi
3527

36-
37-
38-
pwd
39-
ls
40-
41-
42-
4328
CURRENT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
44-
45-
46-
# Check if msbuild is available in PATH
4729
if 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}
5032
else
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-
5937
fi
6038

6139
ret=$?

scripts/vs/build_dev_frontend.sh

100644100755
File mode changed.

scripts/vs/build_frontend.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff 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."
4041
else
4142
# File does not exist
@@ -52,7 +53,8 @@ npm run
5253
echo "====== 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

scripts/vs/ci_cmd_package.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff 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."
4142
else
4243
# File does not exist

scripts/vs/ci_frontend_package.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff 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

0 commit comments

Comments
 (0)