Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1,20 @@
* text=auto
# Explicitly declare text files to normalize
*.cpp text
*.h text
*.mm text

# Files with CRLF line endings for Windows
*.sln text eol=crlf
*.vcxproj* text eol=crlf
.appveyor.yml text eol=crlf
*.bat text eol=crlf
*.props text eol=crlf
*.filters text eol=crlf

# Files with LF line endings for Unix-like systems
*.sh text eol=lf

# Binary files (no EOL normalization)
*.png binary
*.jpg binary
22 changes: 0 additions & 22 deletions scripts/vs/build_cmdline.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,56 +6,34 @@ PG_DIR="$( cd "$( dirname "${SCRIPT_DIR}/../../" )" && pwd )"

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


echo "CURRENT_DIR: ${CURRENT_DIR}"
echo "SCRIPT_DIR: ${SCRIPT_DIR}"
echo "PG_DIR: ${PG_DIR}"

echo "====== OF_DIR: ${OF_DIR}"

echo "====== "
# Compile commandline tool
cd ${PG_DIR}
cd commandLine

echo "Building openFrameworks commandLine PG - VS"


if [ -z "${PLATFORM+x}" ]; then
PLATFORM=x64
fi

if [ -z "${TOOLSET+x}" ]; then
TOOLSET=v143
fi

if [ -z "${CONFIGURATION+x}" ]; then
CONFIGURATION=${CONFIGURATION:-Release}
fi



pwd
ls



CURRENT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"


# Check if msbuild is available in PATH
if command -v msbuild &> /dev/null; then
echo "msbuild is available, use it directly"
msbuild "commandLine.vcxproj" //p:configuration=${CONFIGURATION} //p:platform=${PLATFORM} //p:PlatformToolset=${TOOLSET}
else
echo "msbuild is not available, use the specified path"
#VS_BASE_PATH="/c/Program Files/Microsoft Visual Studio/2022/Community"
#MSBUILD_PATH="${VS_BASE_PATH}/MSBuild/Current/Bin/MSBuild.exe"

MSBUILD_PATH="C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\MSBuild\\Current\\Bin\\MSBuild.exe"
MSSTRING="//p:configuration=${CONFIGURATION} //p:platform=${PLATFORM} //p:PlatformToolset=${TOOLSET}"
"${MSBUILD_PATH}" commandLine.sln ${MSSTRING}

fi

ret=$?
Expand Down
Empty file modified scripts/vs/build_dev_frontend.sh
100644 → 100755
Empty file.
4 changes: 3 additions & 1 deletion scripts/vs/build_frontend.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ if [ -f "$SOURCE_FILE" ]; then
cp "$SOURCE_FILE" "$DESTINATION_PATH/projectGenerator.exe"
. "${SCRIPT_DIR}/secure.sh"
secure "$DESTINATION_PATH/projectGenerator.exe" projectGenerator.pkl
chmod +x $DESTINATION_PATH/projectGenerator.exe
echo "projectGenerator.exe File copied successfully."
else
# File does not exist
Expand All @@ -52,7 +53,8 @@ npm run
echo "====== run"

. "${SCRIPT_DIR}/secure.sh"
secure "${_DIR}/projectGenerator.exe" projectGenerator.pkl
secure "${DESTINATION_PATH}/projectGenerator.exe" projectGenerator.pkl
chmod +x $DESTINATION_PATH/projectGenerator.exe

# if [ "${BUILD_TEST}" == 1 ]; then
npm run start:prod
Expand Down
1 change: 1 addition & 0 deletions scripts/vs/ci_cmd_package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ if [ -f "$SOURCE_FILE" ]; then
cp "$SOURCE_FILE" "$DESTINATION_PATH/projectGenerator.exe"
. "${SCRIPT_DIR}/secure.sh"
secure "$DESTINATION_PATH/projectGenerator.exe" projectGenerator.pkl
chmod +x $DESTINATION_PATH/projectGenerator.exe
echo "projectGenerator.exe File copied successfully."
else
# File does not exist
Expand Down
6 changes: 3 additions & 3 deletions scripts/vs/ci_frontend_package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ if [ -d "win-unpacked" ]; then

cd "win-unpacked"

_DIR=$(pwd)
DIR=$(pwd)

. "${SCRIPT_DIR}/secure.sh"
secure "{_DIR}/projectGenerator.exe" projectGenerator.pkl

secure "${DIR}/projectGenerator.exe" projectGenerator.pkl
chmod +x ${DIR}/projectGenerator.exe
zip -r "../projectGenerator-vs-gui.zip" "."
pwd
ls
Expand Down