Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added darwin arm64 #44

Open
wants to merge 1 commit into
base: mainline
Choose a base branch
from
+54 −6
Open

added darwin arm64 #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Tools/src/create_darwin_bundle_plugin.sh → .../src/create_darwin_amd64_bundle_plugin.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ echo "Copying install script"
cp ${GO_SPACE}/Tools/src/darwin/install ${GO_SPACE}/bin/darwin_amd64_plugin/sessionmanager-bundle/install
chmod 755 ${GO_SPACE}/bin/darwin_amd64_plugin/sessionmanager-bundle/install;

cd ${GO_SPACE}/bin/darwin_amd64_plugin/sessionmanager-bundle/bin/; strip --strip-unneeded session-manager-plugin; cd ~-
cd ${GO_SPACE}/bin/darwin_amd64_plugin/sessionmanager-bundle/bin/; strip session-manager-plugin; cd ~-

echo "Creating the bundle zip file"

Expand Down
38 changes: 38 additions & 0 deletions Tools/src/create_darwin_arm64_bundle_plugin.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
#!/usr/bin/env bash
echo "**********************************************"
echo "Creating bundle zip file Mac OS X arm64 Plugin"
echo "**********************************************"

rm -rf ${GO_SPACE}/bin/darwin_arm64_plugin/sessionmanager-bundle

echo "Creating bundle workspace"

mkdir -p ${GO_SPACE}/bin/darwin_arm64_plugin/sessionmanager-bundle/bin

echo "Copying application files"

cp ${GO_SPACE}/LICENSE ${GO_SPACE}/bin/darwin_arm64_plugin/sessionmanager-bundle/LICENSE
cp ${GO_SPACE}/NOTICE ${GO_SPACE}/bin/darwin_arm64_plugin/sessionmanager-bundle/NOTICE
cp ${GO_SPACE}/THIRD-PARTY ${GO_SPACE}/bin/darwin_arm64_plugin/sessionmanager-bundle/THIRD-PARTY
cp ${GO_SPACE}/README.md ${GO_SPACE}/bin/darwin_arm64_plugin/sessionmanager-bundle/README.md
cp ${GO_SPACE}/RELEASENOTES.md ${GO_SPACE}/bin/darwin_arm64_plugin/sessionmanager-bundle/RELEASENOTES.md
cp ${GO_SPACE}/VERSION ${GO_SPACE}/bin/darwin_arm64_plugin/sessionmanager-bundle/VERSION
cp ${GO_SPACE}/bin/darwin_arm64_plugin/session-manager-plugin ${GO_SPACE}/bin/darwin_arm64_plugin/sessionmanager-bundle/bin/session-manager-plugin
cp ${GO_SPACE}/seelog_unix.xml ${GO_SPACE}/bin/darwin_arm64_plugin/sessionmanager-bundle/seelog.xml.template

echo "Copying install script"

cp ${GO_SPACE}/Tools/src/darwin/install ${GO_SPACE}/bin/darwin_arm64_plugin/sessionmanager-bundle/install
chmod 755 ${GO_SPACE}/bin/darwin_arm64_plugin/sessionmanager-bundle/install;

cd ${GO_SPACE}/bin/darwin_arm64_plugin/sessionmanager-bundle/bin/; strip session-manager-plugin; cd ~-

echo "Creating the bundle zip file"

if [ -f ${GO_SPACE}/bin/darwin_arm64_plugin/sessionmanager-bundle.zip ]
then
rm ${GO_SPACE}/bin/darwin_arm64_plugin/sessionmanager-bundle.zip
fi

cd ${GO_SPACE}/bin/darwin_arm64_plugin;
zip -r ${GO_SPACE}/bin/darwin_arm64_plugin/sessionmanager-bundle.zip ./sessionmanager-bundle
2 changes: 1 addition & 1 deletion Tools/src/darwin/install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python3
import optparse
import os
import shutil
Expand Down
18 changes: 14 additions & 4 deletions makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,11 @@ export GO_SPACE
checkstyle::
# Run checkstyle script
$(GO_SPACE)/Tools/src/checkstyle.sh

build:: build-linux-amd64 build-linux-386 build-arm build-arm64 build-darwin-amd64 build-windows-amd64 build-windows-386
build:: build-linux-amd64 build-linux-386 build-arm build-arm64 build-darwin-arm64 build-darwin-amd64 build-windows-amd64 build-windows-386

prepack:: prepack-linux-amd64 prepack-linux-386 prepack-linux-arm64 prepack-windows-386 prepack-windows-amd64

package:: create-package-folder package-rpm-amd64 package-rpm-386 package-rpm-arm64 package-deb-amd64 package-deb-386 package-deb-arm package-deb-arm64 package-darwin-amd64 package-win-386 package-win-amd64
package:: create-package-folder package-rpm-amd64 package-rpm-386 package-rpm-arm64 package-deb-amd64 package-deb-386 package-deb-arm package-deb-arm64 package-darwin-arm64 package-darwin-amd64 package-win-386 package-win-amd64

release:: clean checkstyle release-test pre-release build prepack package copy-package-dependencies

Expand Down Expand Up @@ -108,6 +107,13 @@ build-arm64: checkstyle copy-src pre-build
GOOS=linux GOARCH=arm64 $(GO_BUILD) -ldflags "-s -w -extldflags=-Wl,-z,now,-z,relro,-z,defs" -o $(GO_SPACE)/bin/linux_arm64_plugin/session-manager-plugin -v \
$(GO_SPACE)/src/sessionmanagerplugin-main/main.go

.PHONY: build-darwin-arm64
build-darwin-arm64: checkstyle copy-src pre-build
@echo "Build for darwin platform"
GOOS=darwin GOARCH=arm64 $(GO_BUILD) -ldflags "-s -w" -o $(GO_SPACE)/bin/darwin_arm64_plugin/session-manager-plugin -v \
$(GO_SPACE)/src/sessionmanagerplugin-main/main.go
GOOS=darwin GOARCH=arm64 $(GO_BUILD) -ldflags "-s -w" -o $(GO_SPACE)/bin/darwin_arm64/ssmcli -v \
$(GO_SPACE)/src/ssmcli-main/main.go

.PHONY: build-darwin-amd64
build-darwin-amd64: checkstyle copy-src pre-build
Expand Down Expand Up @@ -231,9 +237,13 @@ package-deb-arm: create-package-folder
package-deb-arm64: create-package-folder
$(GO_SPACE)/Tools/src/create_deb_arm64_plugin.sh

.PHONY: package-darwin-arm64
package-darwin-arm64:
$(GO_SPACE)/Tools/src/create_darwin_arm64_bundle_plugin.sh

.PHONY: package-darwin-amd64
package-darwin-amd64:
$(GO_SPACE)/Tools/src/create_darwin_bundle_plugin.sh
$(GO_SPACE)/Tools/src/create_darwin_amd64_bundle_plugin.sh

.PHONY: package-win-386
package-win-386: create-package-folder
Expand Down