You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ma...@apache.org on 2017/10/15 19:16:09 UTC

[1/2] incubator-netbeans git commit: [NETBEANS-54] Module Review dlight.nativeexecution

Repository: incubator-netbeans
Updated Branches:
  refs/heads/master 7879b6166 -> fc3195767


[NETBEANS-54] Module Review dlight.nativeexecution

  - The external/exechlp-1.0.zip binary is generated by the scripts and code in tools/
  - So I'm assuming this is an Apache 2.0 license as well.
  - Added license headers to makefiles and different scripts
  - No other licensing headers required.
  - Test org.netbeans.modules.nativeexecution.api.util.ConnectionManagerTest failed in my box.


Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/c95443b3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/c95443b3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/c95443b3

Branch: refs/heads/master
Commit: c95443b31fd265e7c84f732049b019b42984e7c7
Parents: b47ff82
Author: Antonio Vieiro <an...@vieiro.net>
Authored: Thu Oct 12 22:22:16 2017 +0200
Committer: Antonio Vieiro <an...@vieiro.net>
Committed: Thu Oct 12 22:22:16 2017 +0200

----------------------------------------------------------------------
 .../external/exechlp-1.0-license.txt            | 204 ++++++++++++++++++-
 dlight.nativeexecution/tools/buildall.sh        |  49 ++---
 .../tools/killall/make/Makefile.gmake           |  17 ++
 .../tools/killall/make/Makefile.make            |  17 ++
 dlight.nativeexecution/tools/killall/make/line  |  17 ++
 dlight.nativeexecution/tools/pty/.hgignore      |  16 ++
 .../tools/pty/make/Makefile.gmake               |  17 ++
 .../tools/pty/make/Makefile.make                |  17 ++
 dlight.nativeexecution/tools/pty/make/line      |  17 ++
 .../tools/unbuffer/make/Makefile.gmake          |  17 ++
 .../tools/unbuffer/make/Makefile.make           |  17 ++
 dlight.nativeexecution/tools/unbuffer/make/line |  18 ++
 12 files changed, 386 insertions(+), 37 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/c95443b3/dlight.nativeexecution/external/exechlp-1.0-license.txt
----------------------------------------------------------------------
diff --git a/dlight.nativeexecution/external/exechlp-1.0-license.txt b/dlight.nativeexecution/external/exechlp-1.0-license.txt
index d714564..01cfaab 100644
--- a/dlight.nativeexecution/external/exechlp-1.0-license.txt
+++ b/dlight.nativeexecution/external/exechlp-1.0-license.txt
@@ -1,7 +1,7 @@
 Name: exechlp
 Version: 1.0
 Description: binaries that used by dlight.nativeexecution module
-License: TBD
+License: Apache License 2.0
 OSR: -
 Origin: -
 Files: exechlp-1.0.zip contains killall process_start pty pty_open sigqueue stat unbuffer.so for different platforms
@@ -15,5 +15,205 @@ unbuffer.so - used when unbuffering is required
 
 Use of exechlp version 1.0 is governed by the terms of the license below:
 
-TBD
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
 

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/c95443b3/dlight.nativeexecution/tools/buildall.sh
----------------------------------------------------------------------
diff --git a/dlight.nativeexecution/tools/buildall.sh b/dlight.nativeexecution/tools/buildall.sh
index a7be89a..403a8ca 100644
--- a/dlight.nativeexecution/tools/buildall.sh
+++ b/dlight.nativeexecution/tools/buildall.sh
@@ -1,41 +1,20 @@
 #/bin/bash
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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
 #
-# Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License.  When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
+# 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.
 
 # To build in debug mode export DEBUG=Y variable
 

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/c95443b3/dlight.nativeexecution/tools/killall/make/Makefile.gmake
----------------------------------------------------------------------
diff --git a/dlight.nativeexecution/tools/killall/make/Makefile.gmake b/dlight.nativeexecution/tools/killall/make/Makefile.gmake
index d175ad8..329cfdf 100644
--- a/dlight.nativeexecution/tools/killall/make/Makefile.gmake
+++ b/dlight.nativeexecution/tools/killall/make/Makefile.gmake
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+
 OBJS := $(SOURCES:$(ROOT_DIR)/%.c=$(OBJ_DIR)/%.o)
 OBJ_DIRS := $(SRC_DIRS:$(ROOT_DIR)/%=$(OBJ_DIR)/%)
 DEPS := $(OBJS:%.o=%.d)

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/c95443b3/dlight.nativeexecution/tools/killall/make/Makefile.make
----------------------------------------------------------------------
diff --git a/dlight.nativeexecution/tools/killall/make/Makefile.make b/dlight.nativeexecution/tools/killall/make/Makefile.make
index 51f4b19..4a9027a 100644
--- a/dlight.nativeexecution/tools/killall/make/Makefile.make
+++ b/dlight.nativeexecution/tools/killall/make/Makefile.make
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+
 OBJS = $(SOURCES:$(ROOT_DIR)/%.c=$(OBJ_DIR)/%.o)
 OBJ_DIRS = $(SRC_DIRS:$(ROOT_DIR)/%=$(OBJ_DIR)/%)
 $(OBJS) := DEP = $(@:$(OBJ_DIR)/%.o=$(ROOT_DIR)/%.c)

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/c95443b3/dlight.nativeexecution/tools/killall/make/line
----------------------------------------------------------------------
diff --git a/dlight.nativeexecution/tools/killall/make/line b/dlight.nativeexecution/tools/killall/make/line
index ed7e2fb..674d08d 100755
--- a/dlight.nativeexecution/tools/killall/make/line
+++ b/dlight.nativeexecution/tools/killall/make/line
@@ -1,5 +1,22 @@
 #!/bin/sh
 
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+
 SYM=${1:-=}
 COLS=`(stty -a | sed -n "s/.*columns[^0-9]*\([0-9]*\).*/\1/p") 2>/dev/null`;
 test -z "${COLS}" && COLS=`(stty -a | sed -n "s/.*; \([0-9]*\) columns;.*/\1/p") 2>/dev/null`;

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/c95443b3/dlight.nativeexecution/tools/pty/.hgignore
----------------------------------------------------------------------
diff --git a/dlight.nativeexecution/tools/pty/.hgignore b/dlight.nativeexecution/tools/pty/.hgignore
index 552d9ac..657c9d8 100644
--- a/dlight.nativeexecution/tools/pty/.hgignore
+++ b/dlight.nativeexecution/tools/pty/.hgignore
@@ -1,3 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
 ^.make.state.*
 ^build/
 ^dist/

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/c95443b3/dlight.nativeexecution/tools/pty/make/Makefile.gmake
----------------------------------------------------------------------
diff --git a/dlight.nativeexecution/tools/pty/make/Makefile.gmake b/dlight.nativeexecution/tools/pty/make/Makefile.gmake
index d175ad8..329cfdf 100644
--- a/dlight.nativeexecution/tools/pty/make/Makefile.gmake
+++ b/dlight.nativeexecution/tools/pty/make/Makefile.gmake
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+
 OBJS := $(SOURCES:$(ROOT_DIR)/%.c=$(OBJ_DIR)/%.o)
 OBJ_DIRS := $(SRC_DIRS:$(ROOT_DIR)/%=$(OBJ_DIR)/%)
 DEPS := $(OBJS:%.o=%.d)

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/c95443b3/dlight.nativeexecution/tools/pty/make/Makefile.make
----------------------------------------------------------------------
diff --git a/dlight.nativeexecution/tools/pty/make/Makefile.make b/dlight.nativeexecution/tools/pty/make/Makefile.make
index b3ad853..846b980 100644
--- a/dlight.nativeexecution/tools/pty/make/Makefile.make
+++ b/dlight.nativeexecution/tools/pty/make/Makefile.make
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+
 OBJS = $(SOURCES:$(ROOT_DIR)/%.c=$(OBJ_DIR)/%.o)
 OBJ_DIRS = $(SRC_DIRS:$(ROOT_DIR)/%=$(OBJ_DIR)/%)
 $(OBJS) := DEP = $(@:$(OBJ_DIR)/%.o=$(ROOT_DIR)/%.c)

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/c95443b3/dlight.nativeexecution/tools/pty/make/line
----------------------------------------------------------------------
diff --git a/dlight.nativeexecution/tools/pty/make/line b/dlight.nativeexecution/tools/pty/make/line
index ed7e2fb..674d08d 100755
--- a/dlight.nativeexecution/tools/pty/make/line
+++ b/dlight.nativeexecution/tools/pty/make/line
@@ -1,5 +1,22 @@
 #!/bin/sh
 
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+
 SYM=${1:-=}
 COLS=`(stty -a | sed -n "s/.*columns[^0-9]*\([0-9]*\).*/\1/p") 2>/dev/null`;
 test -z "${COLS}" && COLS=`(stty -a | sed -n "s/.*; \([0-9]*\) columns;.*/\1/p") 2>/dev/null`;

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/c95443b3/dlight.nativeexecution/tools/unbuffer/make/Makefile.gmake
----------------------------------------------------------------------
diff --git a/dlight.nativeexecution/tools/unbuffer/make/Makefile.gmake b/dlight.nativeexecution/tools/unbuffer/make/Makefile.gmake
index d175ad8..329cfdf 100644
--- a/dlight.nativeexecution/tools/unbuffer/make/Makefile.gmake
+++ b/dlight.nativeexecution/tools/unbuffer/make/Makefile.gmake
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+
 OBJS := $(SOURCES:$(ROOT_DIR)/%.c=$(OBJ_DIR)/%.o)
 OBJ_DIRS := $(SRC_DIRS:$(ROOT_DIR)/%=$(OBJ_DIR)/%)
 DEPS := $(OBJS:%.o=%.d)

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/c95443b3/dlight.nativeexecution/tools/unbuffer/make/Makefile.make
----------------------------------------------------------------------
diff --git a/dlight.nativeexecution/tools/unbuffer/make/Makefile.make b/dlight.nativeexecution/tools/unbuffer/make/Makefile.make
index b3ad853..846b980 100644
--- a/dlight.nativeexecution/tools/unbuffer/make/Makefile.make
+++ b/dlight.nativeexecution/tools/unbuffer/make/Makefile.make
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+
 OBJS = $(SOURCES:$(ROOT_DIR)/%.c=$(OBJ_DIR)/%.o)
 OBJ_DIRS = $(SRC_DIRS:$(ROOT_DIR)/%=$(OBJ_DIR)/%)
 $(OBJS) := DEP = $(@:$(OBJ_DIR)/%.o=$(ROOT_DIR)/%.c)

http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/c95443b3/dlight.nativeexecution/tools/unbuffer/make/line
----------------------------------------------------------------------
diff --git a/dlight.nativeexecution/tools/unbuffer/make/line b/dlight.nativeexecution/tools/unbuffer/make/line
index ed7e2fb..3b9dcaa 100755
--- a/dlight.nativeexecution/tools/unbuffer/make/line
+++ b/dlight.nativeexecution/tools/unbuffer/make/line
@@ -1,5 +1,23 @@
 #!/bin/sh
 
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+
+
 SYM=${1:-=}
 COLS=`(stty -a | sed -n "s/.*columns[^0-9]*\([0-9]*\).*/\1/p") 2>/dev/null`;
 test -z "${COLS}" && COLS=`(stty -a | sed -n "s/.*; \([0-9]*\) columns;.*/\1/p") 2>/dev/null`;


[2/2] incubator-netbeans git commit: Merge branch 'pr/135'

Posted by ma...@apache.org.
Merge branch 'pr/135'


Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/fc319576
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/fc319576
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/fc319576

Branch: refs/heads/master
Commit: fc31957678c1fbde30bec0a1b3db1b9c0c7e799c
Parents: 7879b61 c95443b
Author: Matthias Bläsing <mb...@doppel-helix.eu>
Authored: Sun Oct 15 21:15:58 2017 +0200
Committer: Matthias Bläsing <mb...@doppel-helix.eu>
Committed: Sun Oct 15 21:15:58 2017 +0200

----------------------------------------------------------------------
 .../external/exechlp-1.0-license.txt            | 204 ++++++++++++++++++-
 dlight.nativeexecution/tools/buildall.sh        |  49 ++---
 .../tools/killall/make/Makefile.gmake           |  17 ++
 .../tools/killall/make/Makefile.make            |  17 ++
 dlight.nativeexecution/tools/killall/make/line  |  17 ++
 dlight.nativeexecution/tools/pty/.hgignore      |  16 ++
 .../tools/pty/make/Makefile.gmake               |  17 ++
 .../tools/pty/make/Makefile.make                |  17 ++
 dlight.nativeexecution/tools/pty/make/line      |  17 ++
 .../tools/unbuffer/make/Makefile.gmake          |  17 ++
 .../tools/unbuffer/make/Makefile.make           |  17 ++
 dlight.nativeexecution/tools/unbuffer/make/line |  18 ++
 12 files changed, 386 insertions(+), 37 deletions(-)
----------------------------------------------------------------------