Skip to content

Commit b634f48

Browse files
author
Eman Copty
committed
1.12.01 release: Apache license updates
Update Docs with latest docs based on 2.08.01 release Delete FW file
1 parent fd8fd03 commit b634f48

File tree

198 files changed

+3392
-1161
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

198 files changed

+3392
-1161
lines changed

ATTRIBUTIONS

Lines changed: 471 additions & 0 deletions
Large diffs are not rendered by default.

LICENSE

Lines changed: 32 additions & 193 deletions
Large diffs are not rendered by default.

api/LICENSE

Lines changed: 32 additions & 193 deletions
Large diffs are not rendered by default.

api/include/mvnc.h

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
/*
2+
*
3+
* Copyright (c) 2017-2018 Intel Corporation. All Rights Reserved
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
118
#ifndef __MVNC_H_INCLUDED__
219
#define __MVNC_H_INCLUDED__
320

api/include/mvnc_deprecated.h

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
/*
2+
*
3+
* Copyright (c) 2017-2018 Intel Corporation. All Rights Reserved
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
118
#ifndef __MVNC_DEPRECATED_H_INCLUDED__
219
#define __MVNC_DEPRECATED_H_INCLUDED__
320

api/python/mvnc/mvncapi.py

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
1-
# Copyright 2017 Intel Corporation.
2-
# The source code, information and material ("Material") contained herein is
3-
# owned by Intel Corporation or its suppliers or licensors, and title to such
4-
# Material remains with Intel Corporation or its suppliers or licensors.
5-
# The Material contains proprietary information of Intel or its suppliers and
6-
# licensors. The Material is protected by worldwide copyright laws and treaty
7-
# provisions.
8-
# No part of the Material may be used, copied, reproduced, modified, published,
9-
# uploaded, posted, transmitted, distributed or disclosed in any way without
10-
# Intel's prior express written permission. No license under any patent,
11-
# copyright or other intellectual property rights in the Material is granted to
12-
# or conferred upon you, either expressly, by implication, inducement, estoppel
13-
# or otherwise.
14-
# Any license under such intellectual property rights must be express and
15-
# approved by Intel in writing.
1+
# Copyright (c) 2017-2018 Intel Corporation. All Rights Reserved
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
1614

1715
import sys
1816
import numpy

api/src/Makefile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ LDFLAGS += -shared
2424
OBJS := $(SRCS:%.c=$(OBJDIR)/%.o)
2525
DEPS := $(OBJS:.o=.d)
2626

27-
all: obj-$(ARCH)/libmvnc.so.0
27+
all: $(OBJDIR)/$(OUT) get_mvcmd
2828

2929
$(OBJDIR)/$(OUT): $(OBJS)
3030
$(CC) $(LDFLAGS) $(OBJS) -o $@ $(LIBS)
@@ -39,6 +39,10 @@ $(OBJDIR):
3939

4040
-include $(DEPS)
4141

42+
.PHONY: get_mvcmd
43+
get_mvcmd:
44+
@./get_mvcmd.sh
45+
4246
basicinstall: $(OBJDIR)/$(OUT)
4347
mkdir -p $(INSTALLDIR)/include/
4448
mkdir -p $(INSTALLDIR)/lib/
@@ -61,7 +65,7 @@ postinstall:
6165
udevadm trigger
6266
ldconfig
6367

64-
install: basicinstall pythoninstall postinstall
68+
install: get_mvcmd basicinstall pythoninstall postinstall
6569

6670
uninstall:
6771
rm -f $(INSTALLDIR)/lib/libmvnc.so.0
@@ -79,3 +83,4 @@ clean:
7983
rm -f $(OBJS)
8084
rm -rf $(OBJDIR)
8185
rm -f libmvnc.so
86+
find mvnc/ -type f -delete

api/src/Makefile.rpi

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ LDFLAGS += -shared
2626
OBJS := $(SRCS:%.c=$(OBJDIR)/%.o)
2727
DEPS := $(OBJS:.o=.d)
2828

29+
all: $(OBJDIR)/$(OUT) get_mvcmd
30+
31+
get_mvcmd:
32+
@./get_mvcmd.sh
33+
2934
$(OBJDIR)/$(OUT): $(OBJS)
3035
$(CC) $(LDFLAGS) $(OBJS) -o $@ $(LIBS)
3136

@@ -41,3 +46,4 @@ clean:
4146
rm -f $(OUT)
4247
rm -f $(OBJS)
4348
rm -rf $(OBJDIR)
49+
find mvnc/ -type f -delete

api/src/USBLinkDefines.h

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
/*
2-
* Copyright 2017 Intel Corporation.
3-
* The source code, information and material ("Material") contained herein is
4-
* owned by Intel Corporation or its suppliers or licensors, and title to such
5-
* Material remains with Intel Corporation or its suppliers or licensors.
6-
* The Material contains proprietary information of Intel or its suppliers and
7-
* licensors. The Material is protected by worldwide copyright laws and treaty
8-
* provisions.
9-
* No part of the Material may be used, copied, reproduced, modified, published,
10-
* uploaded, posted, transmitted, distributed or disclosed in any way without
11-
* Intel's prior express written permission. No license under any patent,
12-
* copyright or other intellectual property rights in the Material is granted to
13-
* or conferred upon you, either expressly, by implication, inducement, estoppel
14-
* or otherwise.
15-
* Any license under such intellectual property rights must be express and
16-
* approved by Intel in writing.
2+
*
3+
* Copyright (c) 2017-2018 Intel Corporation. All Rights Reserved
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
1716
*/
1817

1918
#ifndef _USBLINKCOMMONDEFINES_H

api/src/common.h

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
/*
2-
* Copyright 2017 Intel Corporation.
3-
* The source code, information and material ("Material") contained herein is
4-
* owned by Intel Corporation or its suppliers or licensors, and title to such
5-
* Material remains with Intel Corporation or its suppliers or licensors.
6-
* The Material contains proprietary information of Intel or its suppliers and
7-
* licensors. The Material is protected by worldwide copyright laws and treaty
8-
* provisions.
9-
* No part of the Material may be used, copied, reproduced, modified, published,
10-
* uploaded, posted, transmitted, distributed or disclosed in any way without
11-
* Intel's prior express written permission. No license under any patent,
12-
* copyright or other intellectual property rights in the Material is granted to
13-
* or conferred upon you, either expressly, by implication, inducement, estoppel
14-
* or otherwise.
15-
* Any license under such intellectual property rights must be express and
16-
* approved by Intel in writing.
2+
*
3+
* Copyright (c) 2017-2018 Intel Corporation. All Rights Reserved
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
1716
*/
1817

1918
// Common logging macros

0 commit comments

Comments
 (0)