Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
prod_build_cellframe-node
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cellframe
prod_build_cellframe-node
Commits
337b2073
Commit
337b2073
authored
1 month ago
by
Nikolay Panko
Committed by
Dmitry Puzyrkov
1 month ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix 15644
parent
e729633a
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
build.sh
+13
-1
13 additions, 1 deletion
build.sh
packaging/osx.sh
+3
-0
3 additions, 0 deletions
packaging/osx.sh
with
16 additions
and
1 deletion
build.sh
+
13
−
1
View file @
337b2073
...
@@ -113,6 +113,18 @@ fi
...
@@ -113,6 +113,18 @@ fi
.
${
HERE
}
/targets/
${
BUILD_TARGET
}
.sh
.
${
HERE
}
/targets/
${
BUILD_TARGET
}
.sh
# Add -DBUILD_DIAGTOOL=ON if the target is windows
if
[
"
$BUILD_TARGET
"
==
"windows"
]
;
then
BUILD_OPTIONS[
${#
BUILD_OPTIONS
[@]
}
]=
"-DBUILD_DIAGTOOL=ON"
fi
# Add -DBUILD_DIAGTOOL=ON the target is linux
if
[
"
$BUILD_TARGET
"
==
"linux"
]
;
then
BUILD_OPTIONS[
${#
BUILD_OPTIONS
[@]
}
]=
"-DBUILD_DIAGTOOL=ON"
fi
# Add -DBUILD_DIAGTOOL=ON the target is osx
if
[
"
$BUILD_TARGET
"
==
"osx"
]
;
then
BUILD_OPTIONS[
${#
BUILD_OPTIONS
[@]
}
]=
"-DBUILD_DIAGTOOL=ON"
fi
#all base logic from here
#all base logic from here
mkdir
-p
${
BUILD_DIR
}
/build
mkdir
-p
${
BUILD_DIR
}
/build
mkdir
-p
${
BUILD_DIR
}
/dist
mkdir
-p
${
BUILD_DIR
}
/dist
...
@@ -136,4 +148,4 @@ echo "${CMAKE[@]} ${MHERE}/../ -DCREATE_DEFAULT_CONFIG=OFF ${BUILD_OPTIONS[@]}"
...
@@ -136,4 +148,4 @@ echo "${CMAKE[@]} ${MHERE}/../ -DCREATE_DEFAULT_CONFIG=OFF ${BUILD_OPTIONS[@]}"
export
INSTALL_ROOT
=
${
BUILD_DIR
}
/dist
export
INSTALL_ROOT
=
${
BUILD_DIR
}
/dist
"
${
CMAKE
[@]
}
"
${
MHERE
}
/../
-DCREATE_DEFAULT_CONFIG
=
OFF
${
BUILD_OPTIONS
[@]
}
"
${
CMAKE
[@]
}
"
${
MHERE
}
/../
-DCREATE_DEFAULT_CONFIG
=
OFF
${
BUILD_OPTIONS
[@]
}
"
${
MAKE
[@]
}
"
-j
$NPROC
"
${
MAKE
[@]
}
"
-j
$NPROC
"
${
MAKE
[@]
}
"
install
DESTDIR
=
${
INSTALL_ROOT
}
"
${
MAKE
[@]
}
"
install
DESTDIR
=
${
INSTALL_ROOT
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
packaging/osx.sh
+
3
−
0
View file @
337b2073
...
@@ -114,6 +114,9 @@ PACK_LINUX()
...
@@ -114,6 +114,9 @@ PACK_LINUX()
rcodesign sign
--code-signature-flags
runtime
\
rcodesign sign
--code-signature-flags
runtime
\
--p12-file
${
OSX_PKEY_INSTALLER
}
--p12-password
${
OSX_PKEY_INSTALLER_PASS
}
\
--p12-file
${
OSX_PKEY_INSTALLER
}
--p12-password
${
OSX_PKEY_INSTALLER_PASS
}
\
${
PAYLOAD_BUILD
}
/CellframeNode.app/Contents/MacOS/cellframe-node-config
${
PAYLOAD_BUILD
}
/CellframeNode.app/Contents/MacOS/cellframe-node-config
rcodesign sign
--code-signature-flags
runtime
\
--p12-file
${
OSX_PKEY_INSTALLER
}
--p12-password
${
OSX_PKEY_INSTALLER_PASS
}
\
${
PAYLOAD_BUILD
}
/CellframeNode.app/Contents/MacOS/cellframe-diagtool
fi
fi
cp
${
PACKAGE_DIR
}
/preinstall
${
SCRIPTS_BUILD
}
cp
${
PACKAGE_DIR
}
/preinstall
${
SCRIPTS_BUILD
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment