From e02f9c6f3526fe09d902f4416c2acfea048ee325 Mon Sep 17 00:00:00 2001 From: Tiago Ilieve Date: Thu, 9 May 2019 20:49:55 +0200 Subject: [PATCH] Remove 'makedepend.sh' Not needed when using Go modules. --- Makefile | 26 -------------------------- makedepend.sh | 42 ------------------------------------------ 2 files changed, 68 deletions(-) delete mode 100755 makedepend.sh diff --git a/Makefile b/Makefile index f2b66c73f5..31e9ac0e68 100755 --- a/Makefile +++ b/Makefile @@ -61,8 +61,6 @@ STORAGE_PROVISIONER_TAG := v1.8.1 MINIKUBE_LDFLAGS := -X k8s.io/minikube/pkg/version.version=$(VERSION) -X k8s.io/minikube/pkg/version.isoVersion=$(ISO_VERSION) -X k8s.io/minikube/pkg/version.isoPath=$(ISO_BUCKET) PROVISIONER_LDFLAGS := "$(MINIKUBE_LDFLAGS) -s -w" -MAKEDEPEND := GOPATH=$(GOPATH) ./makedepend.sh - MINIKUBEFILES := ./cmd/minikube/ HYPERKIT_FILES := ./cmd/drivers/hyperkit STORAGE_PROVISIONER_FILES := ./cmd/storage-provisioner @@ -107,11 +105,6 @@ out/minikube$(IS_EXE): out/minikube-$(GOOS)-$(GOARCH)$(IS_EXE) out/minikube-windows-amd64.exe: out/minikube-windows-amd64 cp out/minikube-windows-amd64 out/minikube-windows-amd64.exe -out/minikube.d: pkg/minikube/assets/assets.go - $(MAKEDEPEND) out/minikube-$(GOOS)-$(GOARCH) $(ORG) $^ $(MINIKUBEFILES) > $@ - --include out/minikube.d - out/minikube-%: pkg/minikube/assets/assets.go ifeq ($(MINIKUBE_BUILD_IN_DOCKER),y) $(call DOCKER,$(BUILD_IMAGE),/usr/bin/make $@) @@ -181,9 +174,6 @@ test-iso: test-pkg/%: go test -v -test.timeout=60m $(REPOPATH)/$* --tags="$(MINIKUBE_BUILD_TAGS)" -.PHONY: depend -depend: out/minikube.d out/test.d out/docker-machine-driver-hyperkit.d out/storage-provisioner.d out/docker-machine-driver-kvm2.d - .PHONY: all all: cross drivers e2e-cross @@ -203,10 +193,6 @@ integration-versioned: out/minikube go test -v -test.timeout=60m $(REPOPATH)/test/integration --tags="$(MINIKUBE_INTEGRATION_BUILD_TAGS) versioned" $(TEST_ARGS) .PHONY: test -out/test.d: pkg/minikube/assets/assets.go - $(MAKEDEPEND) -t test $(ORG) $^ $(MINIKUBE_TEST_FILES) > $@ - --include out/test.d test: GOPATH=$(GOPATH) ./test.sh @@ -305,10 +291,6 @@ out/minikube-installer.exe: out/minikube-windows-amd64.exe mv out/windows_tmp/minikube-installer.exe out/minikube-installer.exe rm -rf out/windows_tmp -out/docker-machine-driver-hyperkit.d: - $(MAKEDEPEND) out/docker-machine-driver-hyperkit $(ORG) $^ $(HYPERKIT_FILES) > $@ - --include out/docker-machine-driver-hyperkit.d out/docker-machine-driver-hyperkit: ifeq ($(MINIKUBE_BUILD_IN_DOCKER),y) $(call DOCKER,$(HYPERKIT_BUILD_IMAGE),CC=o64-clang CXX=o64-clang++ /usr/bin/make $@) @@ -332,10 +314,6 @@ $(ISO_BUILD_IMAGE): deploy/iso/minikube-iso/Dockerfile @echo "" @echo "$(@) successfully built" -out/storage-provisioner.d: - $(MAKEDEPEND) out/storage-provisioner $(ORG) $^ $(STORAGE_PROVISIONER_FILES) > $@ - --include out/storage-provisioner.d out/storage-provisioner: GOOS=linux go build -o $(BUILD_DIR)/storage-provisioner -ldflags=$(PROVISIONER_LDFLAGS) cmd/storage-provisioner/main.go @@ -377,10 +355,6 @@ release-minikube: out/minikube checksum gsutil cp out/minikube-$(GOOS)-$(GOARCH) $(MINIKUBE_UPLOAD_LOCATION)/$(MINIKUBE_VERSION)/minikube-$(GOOS)-$(GOARCH) gsutil cp out/minikube-$(GOOS)-$(GOARCH).sha256 $(MINIKUBE_UPLOAD_LOCATION)/$(MINIKUBE_VERSION)/minikube-$(GOOS)-$(GOARCH).sha256 -out/docker-machine-driver-kvm2.d: - $(MAKEDEPEND) out/docker-machine-driver-kvm2 $(ORG) $^ $(KVM_DRIVER_FILES) > $@ - --include out/docker-machine-driver-kvm2.d out/docker-machine-driver-kvm2: go build \ -installsuffix "static" \ diff --git a/makedepend.sh b/makedepend.sh deleted file mode 100755 index 8263c7b160..0000000000 --- a/makedepend.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -# Copyright 2018 The Kubernetes Authors All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Generate go dependencies, for make. Uses `go list`. -# Usage: makedepend.sh [-t] output package extra path... - -PATH_FORMAT='{{ .ImportPath }}{{"\n"}}{{join .Deps "\n"}}' -FILE_FORMAT='{{ range $file := .GoFiles }} {{$.Dir}}/{{$file}}{{"\n"}}{{end}}' - -if [ "$1" = "-t" ] -then - PATH_FORMAT='{{ if .TestGoFiles }} {{.ImportPath}} {{end}}' - shift -fi - -out=$1 -pkg=$2 -extra=$3 -paths="$4 $5 $6" - -# check for mandatory parameters -test -n "$out$pkg$paths" || exit 1 - -echo "$out: $extra\\" -go list -f "$PATH_FORMAT" $paths | - grep "$pkg" | - xargs go list -f "$FILE_FORMAT" | - sed -e "s|^ ${GOPATH}| \$(GOPATH)|;s/$/ \\\\/" -echo " #"