diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2f13509 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +*~ +Redist/ +x64-Release/ +Bin/ +Final/ diff --git a/Bin/SensorKinect093-Bin-Linux-x64-v5.1.2.1.tar.bz2 b/Bin/SensorKinect093-Bin-Linux-x64-v5.1.2.1.tar.bz2 deleted file mode 100644 index 8a860f3..0000000 Binary files a/Bin/SensorKinect093-Bin-Linux-x64-v5.1.2.1.tar.bz2 and /dev/null differ diff --git a/Bin/SensorKinect093-Bin-Linux-x86-v5.1.2.1.tar.bz2 b/Bin/SensorKinect093-Bin-Linux-x86-v5.1.2.1.tar.bz2 deleted file mode 100644 index d5575b9..0000000 Binary files a/Bin/SensorKinect093-Bin-Linux-x86-v5.1.2.1.tar.bz2 and /dev/null differ diff --git a/Bin/SensorKinect093-Bin-MacOSX-v5.1.2.1.tar.bz2 b/Bin/SensorKinect093-Bin-MacOSX-v5.1.2.1.tar.bz2 deleted file mode 100644 index 2e804d2..0000000 Binary files a/Bin/SensorKinect093-Bin-MacOSX-v5.1.2.1.tar.bz2 and /dev/null differ diff --git a/Bin/SensorKinect093-Bin-Win32-v5.1.2.1.msi b/Bin/SensorKinect093-Bin-Win32-v5.1.2.1.msi deleted file mode 100644 index 53564d8..0000000 Binary files a/Bin/SensorKinect093-Bin-Win32-v5.1.2.1.msi and /dev/null differ diff --git a/Bin/SensorKinect093-Bin-Win64-v5.1.2.1.msi b/Bin/SensorKinect093-Bin-Win64-v5.1.2.1.msi deleted file mode 100644 index 38ea810..0000000 Binary files a/Bin/SensorKinect093-Bin-Win64-v5.1.2.1.msi and /dev/null differ diff --git a/PSCommon/Platform/Win32/CreateRedist/CopyToRepository.py b/PSCommon/Platform/Win32/CreateRedist/CopyToRepository.py deleted file mode 100644 index 2c39d0d..0000000 --- a/PSCommon/Platform/Win32/CreateRedist/CopyToRepository.py +++ /dev/null @@ -1,78 +0,0 @@ -import os -import sys -import re -import time -import traceback - -packageFullPath = "..\..\..\..\..\PrimeSenseVersions.nsh" - -def find_package_number(findStr, text): - for line in text: - temp = re.search(findStr, line) - if temp != None: - packageNumber = temp.group(1) - return packageNumber - -def copy_files_to_repository(SourcePath,RepositoryPath, BuildDate, PackageVersion, Bits, ProjectName, - Major_version, Minor_version, Maintenance_version, Build_version): - fullVersion = Major_version + "." + Minor_version + "." + Maintenance_version + "." + Build_version - destPath = os.path.join(RepositoryPath, BuildDate + "__" + PackageVersion, "Win" + Bits, - ProjectName + "-" + fullVersion) - os.system("rmdir /S /q " + destPath) - os.system("mkdir " + destPath) - os.system("xcopy /E /I " + SourcePath + " " + destPath) - -def copy_zip_to_repository(SourcePath,RepositoryPath, BuildDate, PackageVersion, Bits, ProjectName, - Major_version, Minor_version, Maintenance_version, Build_version): - fullVersion = Major_version + "." + Minor_version + "." + Maintenance_version + "." + Build_version - destPath = os.path.join(RepositoryPath, BuildDate + "__" + PackageVersion, "Win" + Bits, - ProjectName + "-" + fullVersion) - os.system("rmdir /S /q " + destPath) - os.system("mkdir " + destPath) - os.system("xcopy /I " + SourcePath + " " + destPath) - -def open_package_file(path): - files = open(path).readlines() - packageNumber = find_package_number("!define PACKAGE_VER\s+\"(\S+)\"", files) - return packageNumber - -if __name__ == "__main__": - try: - if len(sys.argv) != 10: - print (("Usage: copyToRepository.py " \ - + " ")) - sys.exit(1) - - finalPath = sys.argv[1] - repositoryPath = sys.argv[2] - buildDate = sys.argv[3] - bits = sys.argv[4] - projectName = sys.argv[5] - major_version = sys.argv[6] - minor_version = sys.argv[7] - maintenance_version = sys.argv[8] - build_version = sys.argv[9] - - packageNumber = '' - if not(os.path.exists(packageFullPath)): - # Redist of OpenNI openSource - packageFullPath = "..\..\..\..\..\..\PrimeSenseVersions.nsh" - packageNumber = open_package_file(packageFullPath) - if packageNumber == '': - sys.exit(1) - copy_zip_to_repository("..\..\..\..\*.zip",repositoryPath, buildDate, packageNumber, bits, - projectName, major_version, minor_version, maintenance_version, build_version) - else: - # Redist of OpenNI - packageNumber = open_package_file(packageFullPath) - if packageNumber == '': - sys.exit(1) - copy_files_to_repository(finalPath,repositoryPath, buildDate, packageNumber, bits, - projectName, major_version, minor_version, maintenance_version, build_version) - - sys.exit(0) - except SystemExit as e: - sys.exit(e) - except: - print ((traceback.print_exc())) - sys.exit(1) diff --git a/PSCommon/Platform/Win32/CreateRedist/__init__.py b/PSCommon/Platform/Win32/CreateRedist/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/PSCommon/Platform/Win32/CreateRedist/redist_base.py b/PSCommon/Platform/Win32/CreateRedist/redist_base.py deleted file mode 100644 index f83c32c..0000000 --- a/PSCommon/Platform/Win32/CreateRedist/redist_base.py +++ /dev/null @@ -1,905 +0,0 @@ -#/**************************************************************************** -#* THIS file should be DUPLICATED IN BOTH * -#* Engine\Platform\Win32\CreateRedist * -#* AND OpenNI\Platform\Win32\CreateRedist * -#* * -#****************************************************************************/ - -#/**************************************************************************** -#* * -#* PrimeSense OpenNI & Sensor * -#* Copyright (C) 2010 PrimeSense Ltd. * -#* * -#* This file is part of PrimeSense Common. * -#* * -#* PrimeSense OpenNI & Sensor are free software: you can redistribute * -#* it and/or modify * -#* it under the terms of the GNU Lesser General Public License as published * -#* by the Free Software Foundation, either version 3 of the License, or * -#* (at your option) any later version. * -#* * -#* PrimeSense OpenNI & Sensor are distributed in the hope that they will * -#* be useful, * -#* but WITHOUT ANY WARRANTY; without even the implied warranty of * -#* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * -#* GNU Lesser General Public License for more details. * -#* * -#* You should have received a copy of the GNU Lesser General Public License * -#* along with PrimeSense OpenNI & Sensor. * -#* If not, see . * -#* * -#****************************************************************************/ - -#-------------Imports----------------------------------------------------------# -from xml.dom.minidom import parse, parseString -import win32con,pywintypes,win32api -from time import strftime -import logging -import glob -import os -import re -import sys -import subprocess -import shutil -import stat -import threading - -#-------------Functions--------------------------------------------------------# - -def is_64_bit_platform(): - result = False - import platform - (bits,linkage) = platform.architecture() - matchObject = re.search('64',bits) - result = matchObject is not None - return result - -def write_dependencides(sln_file, all_samples,sample): - sln_file.write("\tProjectSection(ProjectDependencies) = postProject\n") - for depend in sample.dependencies: - sln_file.write("\t\t" + all_samples[depend].project_guid + " = " + all_samples[depend].project_guid + "\n") - sln_file.write("\tEndProjectSection\n") - -def remove_readonly(path): - for root, dirs, files in os.walk(path): - for fname in files: - full_path = os.path.join(root, fname) - os.chmod(full_path ,stat.S_IWRITE) - -def regx_replace(findStr,repStr,filePath): - "replaces all findStr by repStr in file filePath using regualr expression" - findStrRegx = re.compile(findStr) - tempName=filePath+'~~~' - input = open(filePath) - output = open(tempName,'w') - for s in input: - output.write(findStrRegx.sub(repStr,s)) - output.close() - input.close() - os.remove(filePath) - os.rename(tempName,filePath) - -def get_reg_values(reg_key, value_list): - # open the reg key - try: - reg_key = win32api.RegOpenKeyEx(*reg_key) - except pywintypes.error as e: - raise Exception("Failed to open registry key!") - # Get the values - try: - values = [(win32api.RegQueryValueEx(reg_key, name), data_type) for name, data_type in value_list] - # values list of ((value, type), expected_type) - for (value, data_type), expected in values: - if data_type != expected: - raise Exception("Bad registry value type! Expected %d, got %d instead." % (expected, data_type)) - # values okay, leave only values - values = [value for ((value, data_type), expected) in values] - except pywintypes.error as e: - raise Exception("Failed to get registry value!") - finally: - try: - win32api.RegCloseKey(reg_key) - except pywintypes.error as e: - # We don't care if reg key close failed... - pass - return tuple(values) - -#-------------Classes----------------------------------------------------------# -class SampleData(object): - def __init__(self): - self.name = '' - self.project_dir = '' - self.source_dir = '' - self.project_guid = '' - self.project_file = '' - self.is_net = False - self.is_other = False - self.project_name = '' - self.redist_dir = '' - self.dependencies = [] - - def print_(): - print((self.name)) - - def __str__(self): - return self.name - - def __eval__(self): - return self.name - -class RedistBase(object): - def __init__(self): - self.SCRIPT_DIR = '' - self.VC_version = 0 - self.vc_build_bits = "" - self.output_dir = "" - self.final_dir = "" - self.config_xml_filename = "" - self.redist_name = "" - self.redist_internal_name = '' - self.product_name = '' - self.doxy_file_name = "" - self.write_2010_sample_dependency = False - self.all_samples = None - self.internal_conf_name = '' - self.TIMEOUT_UPGRADE_VS10_SEC = 180 - self.project_is_2010 = False - - def finish_script(self,exit_code): - os.chdir(self.SCRIPT_DIR) - #logging.shutdown() - exit(exit_code) - - def check_args(self,args): - """ - Parse cmdline args; along them are doxy,bitness,VC. - """ - if len(sys.argv) not in [4,5]: - print ("Args: []") - exit(1) - if sys.argv[1] == 'y' or sys.argv[1] == 'Yes': - self.Make_Doxy=1 - elif sys.argv[1] == 'n' or sys.argv[1] == 'No': - self.Make_Doxy=0 - else: - print("Args: ") - print("Doxygen param must be y or n!") - exit(1) - - if sys.argv[2] == '32': - self.vc_build_bits = "32" - elif sys.argv[2] == '64': - self.vc_build_bits = "64" - else: - print("Args: ") - print("BuildTarget param must be 32 or 64!") - exit(1) - - if sys.argv[3] == 'y' or sys.argv[3] == 'Yes': - self.vc_build_type = "/Rebuild" - elif sys.argv[3] == 'n' or sys.argv[3] == 'No': - self.vc_build_type = "/Build" - else: - print("Args: ") - print("FullRebuild param must be y or n!") - exit(1) - - if self.project_is_2010: - self.VC_version = 10 - if len(sys.argv) > 4: - if sys.argv[4] == '9': - print("Project does not support VS2008!") - exit(1) - else: - self.VC_version = 9 - if len(sys.argv) > 4: - if sys.argv[4] == '10': - self.VC_version = 10 - - def init_vs_vars(self): - """ - Checks for the availablity of Visual Studio to compile with. - Currently supports VS2008 (vc9) and VS2010(vc10). - If 64-bit platform, registry key under Software/Wow6432Node/... - """ - self.VS_NEED_UPGRADE = 0 - try: - if self.is_64_bit_platform: - MSVC_KEY = (win32con.HKEY_LOCAL_MACHINE, r"SOFTWARE\Wow6432Node\Microsoft\VisualStudio\9.0") - else: - MSVC_KEY = (win32con.HKEY_LOCAL_MACHINE, r"SOFTWARE\Microsoft\VisualStudio\9.0") - MSVC_VALUES = [("InstallDir", win32con.REG_SZ)] - self.VS_INST_DIR = get_reg_values(MSVC_KEY, MSVC_VALUES)[0] - except Exception as e: - self.VC_version = 10 - - if self.VC_version == 10: - if not self.project_is_2010: - self.VS_NEED_UPGRADE = 1 - - if self.is_64_bit_platform: - MSVC_KEY = (win32con.HKEY_LOCAL_MACHINE, r"SOFTWARE\Wow6432Node\Microsoft\VisualStudio\10.0") - else: - MSVC_KEY = (win32con.HKEY_LOCAL_MACHINE, r"SOFTWARE\Microsoft\VisualStudio\10.0") - MSVC_VALUES = [("InstallDir", win32con.REG_SZ)] - self.VS_INST_DIR = get_reg_values(MSVC_KEY, MSVC_VALUES)[0] - - def init_vars(self): - """ - Initializae misc variables. - Among them: is_64_bit_platform - """ - self.inst_proj_path = 'Platform\\Win32\\Install\\%s\\'%self.redist_internal_name - self.is_64_bit_platform = is_64_bit_platform() - self.DateTimeSTR = strftime("%Y-%m-%d %H:%M:%S") - DateSTR = strftime("%Y-%m-%d") - CONFIG_XML = parse(self.config_xml_filename) - self.WORK_DIR = str(CONFIG_XML.getElementsByTagName("WORK_DIR")[0].firstChild.data) - # Fix to allow reletive path - os.chdir(self.WORK_DIR) - self.WORK_DIR = os.getcwd() + "\\" - os.chdir(self.SCRIPT_DIR) - self.VER = str(CONFIG_XML.getElementsByTagName("VERSION_NUMBER")[0].firstChild.data) - PLATFORM = str(CONFIG_XML.getElementsByTagName("PLATFORM")[0].firstChild.data) - self.PROJECT_SLN = str(CONFIG_XML.getElementsByTagName("PROJECT_SLN")[0].firstChild.data) - self.SAMPLES_SLN = str(CONFIG_XML.getElementsByTagName("SAMPLES_SLN")[0].firstChild.data) - self.PROJECT_NAME = str(CONFIG_XML.getElementsByTagName("PROJECT")[0].firstChild.data) - self.BUILD_DIR = os.path.join(self.WORK_DIR, "Platform", "Win32", "Build") - - ver_regx = re.compile("SDK \d.*\s") - global samples_proj_list - global samples_guid_list - global samples_guid_list_net - samples_proj_list = [] - samples_guid_list = [] - samples_guid_list_net = [] - - if self.vc_build_bits=="32": - self.bin_dir = "Bin" - self.lib_dir = "Lib" - self.vc_build_platform = "Win32" - self.output_dir = "Output32" - self.final_dir = "Final32" - else: - self.bin_dir = "Bin64" - self.lib_dir = "Lib64" - self.vc_build_platform = "x64" - self.output_dir = "Output64" - self.final_dir = "Final64" - - def init_logger(self,name): - """ - Initilizes the logger. - """ - #-------------Log--------------------------------------------------------------# - out_path = os.path.join(self.SCRIPT_DIR,self.output_dir) - if not(os.path.exists(out_path)): - os.mkdir(out_path) - self.logger = logging.getLogger(name) - hdlr = logging.FileHandler(os.path.join(self.output_dir, '%s_redist_maker.log'%name)) - formatter = logging.Formatter('%(asctime)s %(levelname)s %(message)s') - hdlr.setFormatter(formatter) - self.logger.addHandler(hdlr) - self.logger.setLevel(logging.INFO) - - def print_message(self): - """ - TO DO: fix that function in Redist_OpenNi to resemble this (better) version. - """ - #------------Welcome Messege--------=------------------------------------------# - print("\n"); - print("*********************************") - print(("* PrimeSense " + self.redist_name + " Redist *")) - print(("* " + self.DateTimeSTR + " *")) - print("*********************************") - - def build_proj_solution(self): - #--------------Build Project---------------------------------------------------# - print(("* Building " + self.PROJECT_NAME + "...")) - path2output = os.path.join(self.SCRIPT_DIR,self.output_dir) - if not os.path.exists(path2output): - os.makedirs(path2output) - path2final = os.path.join(self.SCRIPT_DIR,self.final_dir) - if not os.path.exists(path2final): - os.makedirs(path2final) - - self.logger.info(("Building " + self.PROJECT_NAME + "...")) - # Set Intel Env - os.system("set INTEL_LICENSE_FILE=C:\\Program Files\\Common Files\\Intel\\Licenses") - # Build project solution - os.chdir(self.WORK_DIR + self.PROJECT_SLN.rpartition("\\")[0]) - print((os.getcwd())) - - out_file = os.path.join(self.SCRIPT_DIR, self.output_dir, "Build"+self.PROJECT_NAME+".txt") - upg_out_file = os.path.join(self.SCRIPT_DIR, self.output_dir, "Build"+self.PROJECT_NAME+"UPG"+".txt") - if self.VS_NEED_UPGRADE == 1: - os.system("attrib -r * /s") - devenv_upg_cmd_str = "\""+self.VS_INST_DIR + "devenv\" " + self.PROJECT_SLN.rpartition("\\")[2]+\ - " /upgrade > " + upg_out_file - print(('upgrading. out put in %s'%out_file)) - print(('command is %s'%devenv_upg_cmd_str)) - my_rc = os.system(devenv_upg_cmd_str) - print(('upgrading finished w result %d'%my_rc)) - #devenv_upg_cmd = Command(devenv_upg_cmd_str) - #devenv_upg_cmd.run(self.TIMEOUT_UPGRADE_VS10_SEC) - - devenv_cmd = '\"'+self.VS_INST_DIR + 'devenv\" ' + self.PROJECT_SLN.rpartition("\\")[2]+\ - " " + self.vc_build_type + " \"release|" + self.vc_build_platform + "\" /out " + \ - out_file - self.logger.debug('Calling vs : %s'%devenv_cmd) - rc = subprocess.call(devenv_cmd, close_fds=True) - self.logger.debug('Calling vs, RC: %d'%rc) - # Get the build output - lines = open(out_file).readlines() - build_result = lines[-2] - print(build_result) - self.logger.info(build_result) - # Check for failed build - failed_builds = 0 - fail_to_open = 0 - - temp = re.search("(\d*) failed",build_result) - if temp != None : - failed_builds = int(temp.group(1)) - - temp2 = re.search('cannot be opened',str(lines)) - if temp2 != None : - fail_to_open = 1 - - if failed_builds != 0 or fail_to_open !=0: - print("Building Failed!!") - self.logger.critical("Building Failed!") - self.finish_script(1) - - # return to work dir - os.chdir(self.WORK_DIR) - - def make_doxy(self): - """ - Make Doxy. - """ - if self.Make_Doxy==1: - print("* Creating Doxygen...") - self.logger.info("Creating Doxygen...") - os.chdir(os.path.join(self.WORK_DIR,"Source\\Doxygen")); - # Replacing version number in the doxygen setup file - res = os.system("attrib -r " + self.doxy_file_name) - print(('removing readonly attribute for Doxyfile: ' + str(res))) - regx_replace(self.redist_name + " \d*.\d*.\d*\s",self.PROJECT_NAME +" " + self.VER + " ",self.doxy_file_name) - if os.path.exists(self.WORK_DIR + "\\Source\\Doxygen\\html\\"): - os.system("rmdir /S /Q html") - # Running doxygen - os.system("mkdir html > null") - #os.system("copy PSSmallLogo.jpg html > null") // where is this file ? - doxy_out_file = os.path.join(self.SCRIPT_DIR,self.output_dir,self.PROJECT_NAME + "Doxy.txt") - doxygen_cmd = "doxygen.exe %s > " % (self.doxy_file_name) + doxy_out_file - os.system(doxygen_cmd) - self.copy_doxy_files() - os.chdir(self.WORK_DIR) - else: - print("Skipping Doxygen...") - - def create_redist_dir(self): - """ - Creates directory structure for Redist. - """ - #-------------Create Redist Dir------------------------------------------------# - print("* Creating Redist Dir...") - self.logger.info("Creating Redist Dir...") - os.chdir(os.path.join(self.WORK_DIR,"Platform","Win32")) - # Removing the old directory - os.system("rmdir /S /Q Redist") - # Creating new directory tree - os.system("mkdir Redist") - os.system("mkdir Redist\\" + self.bin_dir) - os.system("mkdir Redist\\" + self.lib_dir) - os.system("mkdir Redist\\Include") - os.system("mkdir Redist\\Documentation") - os.system("mkdir Redist\\Samples") - os.system("mkdir Redist\\Samples\\" + self.bin_dir) - os.system("mkdir Redist\\Samples\\" + self.bin_dir + "\\Debug") - os.system("mkdir Redist\\Samples\\" + self.bin_dir + "\\Release") - os.system("mkdir Redist\\Samples\\Build") - os.system("mkdir Redist\\Samples\\Res") - os.system("mkdir Redist\\Data") - os.chdir(self.WORK_DIR) - - def find_samples(self): - # returns a dictionary of all samples - all_samples = dict() - os.chdir(self.WORK_DIR) - samples_list = os.listdir(os.path.join(self.BUILD_DIR,"Samples")) - if '.svn' in samples_list: - samples_list.remove('.svn') - for sample in samples_list: - sample_data = SampleData() - sample_data.name = sample - sample_data.source_dir = os.path.join(self.WORK_DIR, "Samples", sample) - sample_data.project_dir = os.path.join(self.BUILD_DIR, "Samples", sample) - sample_data.is_other = False; - - vc_proj_name = sample_data.project_dir + "\\" + sample + ".vcproj" - cs_proj_name = sample_data.project_dir + "\\" + sample + ".csproj" - vcx_proj_name = sample_data.project_dir + "\\" + sample + ".vcxproj" - other_proj_name = os.path.join(sample_data.project_dir, "Build.bat") - - # check if this is a VC project - if os.path.exists(vc_proj_name): - sample_data.project_file = vc_proj_name - - # open it - prj = open(vc_proj_name, 'r') - lines = prj.readlines() - for line in lines: - # Search for name - if sample_data.project_name == "": - ProjNametmp = re.search(r"Name=\"(.*)\"",line) - if (ProjNametmp != None): - sample_data.project_name = ProjNametmp.group(1) - - # Search for GUID - if sample_data.project_guid == "": - ProjGUIDtmp = re.search(r"ProjectGUID=\"(.*)\"",line) - if (ProjGUIDtmp != None): - sample_data.project_guid = ProjGUIDtmp.group(1) - - prj.close() - - elif os.path.exists(vcx_proj_name): - # a VC project for VS 2010 - sample_data.project_file = vcx_proj_name - sample_data.project_name = sample - - # open it - prj = open(vcx_proj_name, 'r') - lines = prj.readlines() - for line in lines: - # Search for name - if sample_data.project_name == "": - ProjNametmp = re.search(r"Name=\"(.*)\"",line) - if (ProjNametmp != None): - sample_data.project_name = ProjNametmp.group(1) - - # Search for GUID - if sample_data.project_guid == "": - ProjGUIDtmp = re.search(r"(.*)", line) - if (ProjGUIDtmp != None): - sample_data.project_guid = ProjGUIDtmp.group(1) - - prj.close() - - elif os.path.exists(cs_proj_name): - # a .NET project - sample_data.project_file = cs_proj_name - sample_data.is_net = True - - # open it - prj = open(cs_proj_name, 'r') - lines = prj.readlines() - for line in lines: - # Search for name - if sample_data.project_name == "": - ProjNametmp = re.search(r"(.*)",line) - if (ProjNametmp != None): - sample_data.project_name = ProjNametmp.group(1) - - # Search for GUID - if sample_data.project_guid == "": - ProjGUIDtmp = re.search(r"(.*)",line) - if (ProjGUIDtmp != None): - sample_data.project_guid = ProjGUIDtmp.group(1) - - prj.close() - - elif os.path.exists(other_proj_name): - # some other type of project (java?) - sample_data.project_file = other_proj_name - sample_data.is_other = True - sample_data.project_name = sample - - else: - print(('Sample ' + sample + ' does not have a valid project file')) - self.finish_script(1) - - # check if it has a special configuration - redist_file_name = sample_data.source_dir + "\\.redist" - if os.path.exists(redist_file_name): - redist_file = open(redist_file_name, 'r') - - for line in redist_file.readlines(): - # seach for dependencies - match = re.search("^DEPENDS=(.*)$", line) - if match != None: - sample_data.dependencies.append(match.group(1)) - - redist_file.close() - - sample_data.redist_dir = "Redist\\Samples\\" + sample_data.name - all_samples[sample_data.name] = sample_data - - return all_samples - - def get_samples(self): - # returns a dictionary of all samples - if self.all_samples == None: - self.all_samples = self.find_samples() - - return self.all_samples - - def build_other_proj(self, build_dir): - # build other (not Visual Studio) project - ret = subprocess.call(os.path.join(build_dir, "Build.bat") + " " + self.vc_build_bits) - if ret != 0: - print(("Building project " + build_dir + " failed!")) - self.logger.critical("Building project " + build_dir + " failed!") - self.finish_script(1) - - def build_other_samples(self): - "Builds other samples (java?)" - all_samples = self.get_samples() - for sample in list(all_samples.values()): - if not sample.is_other: - continue - build_dir = os.path.join(self.BUILD_DIR, "Samples", sample.name) - self.build_other_proj(build_dir) - - def creating_samples(self): - """ - not exactly the same some further work needed. - """ - #-------Creating samples-------------------------------------------------------# - print("* Creating samples...") - self.logger.info("Creating samples...") - - all_samples = self.get_samples() - - os.chdir(os.path.join(self.WORK_DIR, "Platform", "Win32")) - - # open all solution files - if not self.project_is_2010: - OUTFILESLN2008 = open("Redist\\Samples\\Build\\All_2008.sln",'w') - OUTFILESLN2008.write("Microsoft Visual Studio Solution File, Format Version 10.00\n") - OUTFILESLN2008.write("# Visual Studio 2008\n") - - if not self.project_is_2010: - OUTFILESLN2010 = open("Redist\\Samples\\Build\\All_2010.sln",'w') - else: - OUTFILESLN2010 = open("Redist\\Samples\\Build\\All.sln",'w') - - OUTFILESLN2010.write("Microsoft Visual Studio Solution File, Format Version 11.00\n") - OUTFILESLN2010.write("# Visual Studio 2010\n") - - # copy java build script - try: - shutil.copy(os.path.join("Build", "BuildJava.py"), os.path.join("Redist", "Samples", "Build")) - except: - pass - - # add projects - for sample in list(all_samples.values()): - # make dir - os.system ("mkdir " + sample.redist_dir) - # copy source - os.system ("xcopy /S " + sample.source_dir + " " + sample.redist_dir) - - if sample.is_other: - shutil.copy(sample.project_file, sample.redist_dir) - else: - # copy the project file to 2008 and 2010: - prj_name_partitioned = os.path.splitext(sample.project_file); - prj2008_filename = sample.redist_dir + "\\" + sample.name + "_2008" + prj_name_partitioned[1] - - if self.project_is_2010: - prj2010_filename = sample.redist_dir + "\\" + sample.name + prj_name_partitioned[1] - else: - prj2010_filename = sample.redist_dir + "\\" + sample.name + "_2010" + prj_name_partitioned[1] - - if not self.project_is_2010: - shutil.copy(sample.project_file, prj2008_filename) - shutil.copy(sample.project_file, prj2010_filename) - - # create reletive path to samples - prj2008_path = "..\\" + prj2008_filename.partition("\\")[2].partition("\\")[2] - prj2010_path = "..\\" + prj2010_filename.partition("\\")[2].partition("\\")[2] - - # add project to solution - if not self.project_is_2010: - OUTFILESLN2008.write("Project(\"{19091980-2008-4CFA-1491-04CC20D8BCF9}\") = \""+\ - sample.project_name + "\", \"" + prj2008_path + "\", \"" + sample.project_guid + "\"\n") - OUTFILESLN2010.write("Project(\"{19091980-2008-4CFA-1491-04CC20D8BCF9}\") = \""+\ - sample.project_name + "\", \"" + prj2010_path + "\", \"" + sample.project_guid + "\"\n") - - # write down dependencies - if len(sample.dependencies) > 0: - if not self.project_is_2010: - OUTFILESLN2008.write("\tProjectSection(ProjectDependencies) = postProject\n") - for depend in sample.dependencies: - OUTFILESLN2008.write("\t\t" + all_samples[depend].project_guid + " = " + all_samples[depend].project_guid + "\n") - OUTFILESLN2008.write("\tEndProjectSection\n") - if self.write_2010_sample_dependency == True: - write_dependencides(OUTFILESLN2010,all_samples,sample) - - if not self.project_is_2010: - OUTFILESLN2008.write("EndProject\n") - OUTFILESLN2010.write("EndProject\n") - - # Close files - if not self.project_is_2010: - OUTFILESLN2008.write("Global\n") - OUTFILESLN2008.write(" GlobalSection(SolutionConfigurationPlatforms) = preSolution\n") - OUTFILESLN2008.write(" Debug|Win32 = Debug|Win32\n") - OUTFILESLN2008.write(" Debug|x64 = Debug|x64\n") - OUTFILESLN2008.write(" Release|Win32 = Release|Win32\n") - OUTFILESLN2008.write(" Release|x64 = Release|x64\n") - OUTFILESLN2008.write(" EndGlobalSection\n") - OUTFILESLN2008.write(" GlobalSection(ProjectConfigurationPlatforms) = postSolution\n") - OUTFILESLN2010.write("Global\n") - OUTFILESLN2010.write(" GlobalSection(SolutionConfigurationPlatforms) = preSolution\n") - OUTFILESLN2010.write(" Debug|Win32 = Debug|Win32\n") - OUTFILESLN2010.write(" Debug|x64 = Debug|x64\n") - OUTFILESLN2010.write(" Release|Win32 = Release|Win32\n") - OUTFILESLN2010.write(" Release|x64 = Release|x64\n") - OUTFILESLN2010.write(" EndGlobalSection\n") - OUTFILESLN2010.write(" GlobalSection(ProjectConfigurationPlatforms) = postSolution\n") - - for sample in list(all_samples.values()): - conf_32_name = "Win32" - if sample.is_net: - conf_32_name = "x86" - - if not self.project_is_2010: - OUTFILESLN2008.write(" " + sample.project_guid + ".Debug|Win32.ActiveCfg = Debug|" + conf_32_name + "\n") - OUTFILESLN2008.write(" " + sample.project_guid + ".Debug|Win32.Build.0 = Debug|" + conf_32_name + "\n") - OUTFILESLN2008.write(" " + sample.project_guid + ".Debug|x64.ActiveCfg = Debug|x64\n") - OUTFILESLN2008.write(" " + sample.project_guid + ".Debug|x64.Build.0 = Debug|x64\n") - OUTFILESLN2008.write(" " + sample.project_guid + ".Release|Win32.ActiveCfg = Release|" + conf_32_name + "\n") - OUTFILESLN2008.write(" " + sample.project_guid + ".Release|Win32.Build.0 = Release|" + conf_32_name + "\n") - OUTFILESLN2008.write(" " + sample.project_guid + ".Release|x64.ActiveCfg = Release|x64\n") - OUTFILESLN2008.write(" " + sample.project_guid + ".Release|x64.Build.0 = Release|x64\n") - OUTFILESLN2010.write(" " + sample.project_guid + ".Debug|Win32.ActiveCfg = Debug|" + conf_32_name + "\n") - OUTFILESLN2010.write(" " + sample.project_guid + ".Debug|Win32.Build.0 = Debug|" + conf_32_name + "\n") - OUTFILESLN2010.write(" " + sample.project_guid + ".Debug|x64.ActiveCfg = Debug|x64\n") - OUTFILESLN2010.write(" " + sample.project_guid + ".Debug|x64.Build.0 = Debug|x64\n") - OUTFILESLN2010.write(" " + sample.project_guid + ".Release|Win32.ActiveCfg = Release|" + conf_32_name + "\n") - OUTFILESLN2010.write(" " + sample.project_guid + ".Release|Win32.Build.0 = Release|" + conf_32_name + "\n") - OUTFILESLN2010.write(" " + sample.project_guid + ".Release|x64.ActiveCfg = Release|x64\n") - OUTFILESLN2010.write(" " + sample.project_guid + ".Release|x64.Build.0 = Release|x64\n") - - if not self.project_is_2010: - OUTFILESLN2008.write(" EndGlobalSection\n") - OUTFILESLN2008.write(" GlobalSection(SolutionProperties) = preSolution\n") - OUTFILESLN2008.write(" HideSolutionNode = FALSE\n") - OUTFILESLN2008.write(" EndGlobalSection\n") - OUTFILESLN2008.write("EndGlobal \n") - OUTFILESLN2010.write(" EndGlobalSection\n") - OUTFILESLN2010.write(" GlobalSection(SolutionProperties) = preSolution\n") - OUTFILESLN2010.write(" HideSolutionNode = FALSE\n") - OUTFILESLN2010.write(" EndGlobalSection\n") - OUTFILESLN2010.write("EndGlobal \n") - - if not self.project_is_2010: - OUTFILESLN2008.close() - OUTFILESLN2010.close() - - os.chdir(self.WORK_DIR) - - def remove_read_only_attributes(self): - #-----Remove Read Only Attrib--------------------------------------------------# - print("* Removing Read Only Attributes...") - full_path = os.path.join(self.WORK_DIR,"Platform", "Win32" , "Redist") - self.logger.info("Removing Read Only Attributes... (%s)" % (full_path)) - #os.system ("attrib -r -h -s /S Redist\\*.*") - remove_readonly(full_path) - - def make_installer(self,msi_dest_path): - """ - [dev_success,redist_success] - """ - wix_var_file = '%sVariables.wxi'%self.redist_internal_name.replace('_','') - - [dev_success,redist_success] = [False,False] - print("* Making Installer...") - self.logger.info("Making Installer...") - self.wix_inst_primitive_check() - os.chdir(os.path.join(self.WORK_DIR,self.inst_proj_path)) - # Replace version in the WIX - self.wix_dev_var_set() - self.check_upgrade_install_sln() - print("calling WIX") - conf_name = self.internal_conf_name - dev_success = self.build_installer(conf_name) - print(("moving %s Msi"%conf_name)) - src = ('.\\bin\Release\en-US\\%s.msi'%self.redist_internal_name) - dst = os.path.join( msi_dest_path ,self.final_dir,(self.product_name + '-Win' + self.vc_build_bits + "-" + self.VER + '-%s.msi'%conf_name)) - os.system(("move %s %s"%(src,dst))) - self.dev_to_redist_hack() - self.wix_redist_var_set() - print("calling WIX") - conf_name = 'Redist' - redist_success = self.build_installer(conf_name) - print(("moving %s Msi"%conf_name)) - os.system("move .\\bin\Release\en-US\\%s.msi %s"%(self.redist_internal_name,\ - os.path.join( msi_dest_path ,self.final_dir,self.product_name + '-Win' + self.vc_build_bits + "-" + self.VER + '-%s.msi'%conf_name))) - - os.chdir(self.WORK_DIR) - return [dev_success,redist_success] - - def build_installer(self,conf_name): - success = False - wix_log = 'Build%sWIX%s'%(self.redist_internal_name,conf_name) - wix_log.replace('_','') #because outside code expects EENI in the name instead of EE_NI - out_file = os.path.join('..\\..\\CreateRedist',self.output_dir,"%s.txt"%wix_log) - wix_rc = subprocess.call("\"" + self.VS_INST_DIR \ - + "devenv\" %s.wixproj /Build \"release|%s"%(self.redist_internal_name, 'x86' if self.vc_build_bits=='32' else 'x64') \ - + "\" /out " + out_file, close_fds=True) - failed_builds = self.check_vs_report_failed(out_file) - if failed_builds > 0 or wix_rc != 0: - self.logger.info('Fail to build installer for %s version'%conf_name) - else: - success = True - return success - - def wix_redist_var_set(self): - """preconsdition: CWD is where wix-variables-file is stored""" - temp = self.redist_internal_name.replace('_','') - os.system("attrib -r Includes\\%sVariables.wxi"%temp) - #print("setting WIX BuildPlatform") - #regx_replace("BuildPlatform=(.*)", "BuildPlatform=" + str(vc_build_bits) + "?>", "Includes\\OpenNIVariables.wxi") - print("setting WIX BinaryOnlyRedist=True") - regx_replace("BinaryOnlyRedist=(.*)", "BinaryOnlyRedist=True?>", "Includes\\%sVariables.wxi"%temp) - - def wix_dev_var_set(self): - """preconsdition: CWD is where wix-variables-file is stored""" - print("setting WIX BinaryOnlyRedist=False") - temp = self.redist_internal_name.replace('_','') - os.system("attrib -r Includes\\%sVariables.wxi"%temp) - regx_replace("BinaryOnlyRedist=(.*)", "BinaryOnlyRedist=False?>", "Includes\\%sVariables.wxi"%temp) - - def check_upgrade_install_sln(self): - """preconsdition: CWD is where wix-variables-file is stored""" - up_wix_file = os.path.join('..\\..\\CreateRedist',self.output_dir,"Upgrade%sWIX.txt"%(self.redist_internal_name)) - if self.VS_NEED_UPGRADE == 1: - subprocess.call("\"" + self.VS_INST_DIR + \ - "devenv\" %s.sln /upgrade /out "%(self.redist_internal_name) + up_wix_file, close_fds=True) - - def wix_inst_primitive_check(self): - wixPath = os.environ.get('WIX') - if wixPath == None: - print('*** no WIX env. var. defined ! use set WIX=C:\Program Files\Windows Installer XML v3.5\ or similar to set the path ***') - print('make installer is SERIOUSLY expected to fail') - self.logger.info('It seems that WIX is not installed and therefore teh installer cannot be built.') - else: - print(('WIX='+wixPath)) - - def dev_to_redist_hack(self): - pass - - def check_vs_report_failed(self,file): - lines = open(file).readlines() - build_result = lines[-2] - failed_builds = 0 - temp = re.search("(\d*) failed",build_result) - if temp != None : - failed_builds = int(temp.group(1)) - return failed_builds - - def fixing_files(self): - """ - fixing files - """ - #--------Fixing Files----------------------------------------------------------# - print("* Fixing Files...") - self.logger.info("Fixing Files...") - for dirpath, dirnames, filenames in os.walk(os.path.join(self.WORK_DIR, "Platform", "Win32", "Redist")): - self.fix_file('', dirpath, dirnames + filenames) - - def build_samples(self): - """ - Build Samples. - """ - #-------------Build Samples---------------------------------------------------# - print("* Building Samples in release configuration......") - self.logger.info("Building Samples in release configuration...") - # Build project solution - os.chdir(self.WORK_DIR + self.SAMPLES_SLN.rpartition("\\")[0]) - - output_file = os.path.join(self.SCRIPT_DIR ,self.output_dir ,self.PROJECT_NAME + "SmpRelease.txt") - - if self.VS_NEED_UPGRADE == 1: - os.system("\""+self.VS_INST_DIR + "devenv\" " +self.SAMPLES_SLN.rpartition("\\")[2]+\ - " /upgrade > " + output_file) - - subprocess.call("\""+self.VS_INST_DIR + "devenv\" " +self.SAMPLES_SLN.rpartition("\\")[2]+\ - " " + self.vc_build_type + " \"release|" + self.vc_build_platform + "\" /out " + output_file) - - # Get the build output - lines = open(output_file).readlines() - build_result = lines[-2] - print(build_result) - self.logger.info(build_result) - # Check for failed build - - failed_builds = 0 - temp = re.search("(\d*) failed",build_result) - - if temp != None : - failed_builds = int(temp.group(1)) - if failed_builds != 0: - print("Samples Building In Release Failed!!") - self.logger.critical("Samples Building Failed!") - self.finish_script(1) - - print("* Building Samples in debug configuration......") - self.logger.info("Building Samples in debug configuration...") - # Build project solution - os.chdir(self.WORK_DIR +self.SAMPLES_SLN.rpartition("\\")[0]) - - output_file = os.path.join(self.SCRIPT_DIR ,self.output_dir ,self.PROJECT_NAME + "SmpDebug.txt") - - if self.VS_NEED_UPGRADE == 1: - os.system("\""+self.VS_INST_DIR + "devenv\" " +self.SAMPLES_SLN.rpartition("\\")[2]+\ - " /upgrade > " + output_file) - - subprocess.call("\""+self.VS_INST_DIR + "devenv\" " +self.SAMPLES_SLN.rpartition("\\")[2]+\ - " " + self.vc_build_type + " \"debug|" + self.vc_build_platform + "\" /out " + output_file) - - # Get the build output - lines = open(output_file).readlines() - build_result = lines[-2] - print(build_result) - self.logger.info(build_result) - # Check for failed build - - failed_builds = 0 - tempReResult = re.search("(\d*) failed",build_result) - - if tempReResult != None : - failed_builds = int(tempReResult.group(1)) - if failed_builds != 0: - print("Samples Building In Debug Failed!!") - self.logger.critical("Samples Building Failed!") - self.finish_script(1) - - # Build other samples - all_samples = self.get_samples() - for sample in list(all_samples.values()): - if sample.is_other: - self.build_other_proj(os.path.join(self.WORK_DIR, "Platform", "Win32", "Redist", "Samples", sample.name)) - - # --------------------Delete stuff - os.chdir(self.WORK_DIR + "\\Platform\\Win32\\Redist\\Samples\\" + self.bin_dir +"\\Release\\") - os.system("del *.pdb") - os.chdir(self.WORK_DIR + "\\Platform\\Win32\\Redist\\Samples\\" + self.bin_dir +"\\Debug\\") - os.system("del *.pdb") - os.system("del *.ilk") - os.chdir(self.WORK_DIR + "\\Platform\\Win32\\Redist\\" + self.lib_dir + "\\") - os.system("del nim*.*") - - os.chdir(self.WORK_DIR) - - def clean_up(self): - temp_str = "Redist "+ self.redist_name +" Ended." - print(temp_str) - self.logger.info(temp_str) - #self.finish_script(0) -class Command(object): - def __init__(self, cmd): - self.cmd = cmd - self.process = None - - def run(self, timeout): - def target(): - print('Thread started') - self.process = subprocess.Popen(self.cmd, shell=True) - self.process.communicate() - print('Thread finished') - - thread = threading.Thread(target=target) - thread.start() - - thread.join(timeout) - if thread.is_alive(): - print('Terminating process') - self.process.terminate() - thread.join() - print((self.process.returncode)) diff --git a/PSCommon/Platform/Win32/CreateRedist/redist_base.pyc b/PSCommon/Platform/Win32/CreateRedist/redist_base.pyc deleted file mode 100644 index c533fab..0000000 Binary files a/PSCommon/Platform/Win32/CreateRedist/redist_base.pyc and /dev/null differ diff --git a/Platform/Android/jni/Android.mk b/Platform/Android/jni/Android.mk deleted file mode 100644 index 2414b04..0000000 --- a/Platform/Android/jni/Android.mk +++ /dev/null @@ -1,6 +0,0 @@ -# OpenNI Android makefile. -# - -include $(call all-subdir-makefiles) - -$(call import-module,OpenNI) diff --git a/Platform/Android/jni/Application.mk b/Platform/Android/jni/Application.mk deleted file mode 100644 index 6d2da24..0000000 --- a/Platform/Android/jni/Application.mk +++ /dev/null @@ -1,28 +0,0 @@ -APP_STL := gnustl_static - -# Android >= v2.3 -APP_PLATFORM := android-9 - -# Build ARMv7-A machine code. -APP_ABI := armeabi-v7a -APP_CFLAGS := -O3 -ftree-vectorize -ffast-math -funroll-loops - -APP_CFLAGS += -fPIC - -ifeq ($(APP_ABI),armeabi-v7a) - APP_CFLAGS += -march=armv7-a -mfloat-abi=softfp -mtune=cortex-a9 -mfp=vfpv3-d16 -mfpu=vfp - -# optionally add NEON to compilation flags. -# to activate, run: "ndk-build USE_NEON=1" -ifdef USE_NEON -$(call __ndk_info,Building everything with NEON support!) - APP_CFLAGS += -mfpu=neon -DHAVE_NEON=1 -flax-vector-conversions -endif -endif - -APP_CPPFLAGS += -frtti - -#$(call __ndk_info,APP_CFLAGS=$(APP_CFLAGS)) -#$(call __ndk_info,APP_CPPFLAGS=$(APP_CPPFLAGS)) - -#-fsingle-precision-constant diff --git a/Platform/Android/jni/XnCore/Android.mk b/Platform/Android/jni/XnCore/Android.mk deleted file mode 100644 index 979c53b..0000000 --- a/Platform/Android/jni/XnCore/Android.mk +++ /dev/null @@ -1,35 +0,0 @@ -# XnCore Android makefile. -# libXnCore.so -# - -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -# set path to source -MY_PREFIX := $(LOCAL_PATH)/../../../../Source/XnCore/ - -# list all source files -MY_SRC_FILES := \ - $(MY_PREFIX)*.cpp - -# expand the wildcards -MY_SRC_FILE_EXPANDED := $(wildcard $(MY_SRC_FILES)) - -# make those paths relative to here -LOCAL_SRC_FILES := $(MY_SRC_FILE_EXPANDED:$(LOCAL_PATH)/%=%) - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../../../../Include/ \ - $(LOCAL_PATH)/../../../../Source/ \ - -LOCAL_CFLAGS:= -fvisibility=hidden -DXN_CORE_EXPORTS - -LOCAL_LDFLAGS += -Wl,--export-dynamic --dynamic-linker - -LOCAL_SHARED_LIBRARIES := OpenNI libusb - -LOCAL_PREBUILT_LIBS := libc - -LOCAL_MODULE := XnCore - -include $(BUILD_SHARED_LIBRARY) diff --git a/Platform/Android/jni/XnDDK/Android.mk b/Platform/Android/jni/XnDDK/Android.mk deleted file mode 100644 index 3c5d70b..0000000 --- a/Platform/Android/jni/XnDDK/Android.mk +++ /dev/null @@ -1,37 +0,0 @@ -# XnDDK Android makefile. -# libXnDDK.so -# - -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -# set path to source -MY_PREFIX := $(LOCAL_PATH)/../../../../Source/XnDDK/ - -# list all source files -MY_SRC_FILES := \ - $(MY_PREFIX)*.cpp - -# expand the wildcards -MY_SRC_FILE_EXPANDED := $(wildcard $(MY_SRC_FILES)) - -# make those paths relative to here -LOCAL_SRC_FILES := $(MY_SRC_FILE_EXPANDED:$(LOCAL_PATH)/%=%) - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../../../../Include/ \ - $(LOCAL_PATH)/../../../../Source/ \ - $(LOCAL_PATH)/../../../../Source/XnCommon \ - -LOCAL_CFLAGS := -fvisibility=hidden -DXN_DDK_EXPORTS - -LOCAL_LDFLAGS += -Wl,--export-dynamic --dynamic-linker - -LOCAL_SHARED_LIBRARIES := OpenNI libusb XnCore XnFormats - -LOCAL_PREBUILT_LIBS := libc - -LOCAL_MODULE := XnDDK - -include $(BUILD_SHARED_LIBRARY) - diff --git a/Platform/Android/jni/XnDeviceFile/Android.mk b/Platform/Android/jni/XnDeviceFile/Android.mk deleted file mode 100644 index 9fcabe5..0000000 --- a/Platform/Android/jni/XnDeviceFile/Android.mk +++ /dev/null @@ -1,37 +0,0 @@ -# XnDeviceFile Android makefile. -# libXnDeviceFile.so -# - -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -# set path to source -MY_PREFIX := $(LOCAL_PATH)/../../../../Source/XnDeviceFile/ - -# list all source files -MY_SRC_FILES := \ - $(MY_PREFIX)*.cpp - -# expand the wildcards -MY_SRC_FILE_EXPANDED := $(wildcard $(MY_SRC_FILES)) - -# make those paths relative to here -LOCAL_SRC_FILES := $(MY_SRC_FILE_EXPANDED:$(LOCAL_PATH)/%=%) - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../../../../Include/ \ - $(LOCAL_PATH)/../../../../Source/ \ - $(LOCAL_PATH)/../../../../Source/XnCommon \ - -LOCAL_CFLAGS := -fvisibility=hidden -DXN_DEVICE_EXPORTS - -LOCAL_LDFLAGS += -Wl,--export-dynamic --dynamic-linker - -LOCAL_SHARED_LIBRARIES := OpenNI libusb XnCore XnFormats XnDDK - -LOCAL_PREBUILT_LIBS := libc - -LOCAL_MODULE := XnDeviceFile - -include $(BUILD_SHARED_LIBRARY) - diff --git a/Platform/Android/jni/XnDeviceSensorV2/Android.mk b/Platform/Android/jni/XnDeviceSensorV2/Android.mk deleted file mode 100644 index 8df6499..0000000 --- a/Platform/Android/jni/XnDeviceSensorV2/Android.mk +++ /dev/null @@ -1,37 +0,0 @@ -# XnDeviceSensorV2 Android makefile. -# libXnDeviceSensorV2.so -# - -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -# set path to source -MY_PREFIX := $(LOCAL_PATH)/../../../../Source/XnDeviceSensorV2/ - -# list all source files -MY_SRC_FILES := \ - $(MY_PREFIX)*.cpp - -# expand the wildcards -MY_SRC_FILE_EXPANDED := $(wildcard $(MY_SRC_FILES)) - -# make those paths relative to here -LOCAL_SRC_FILES := $(MY_SRC_FILE_EXPANDED:$(LOCAL_PATH)/%=%) - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../../../../Include/ \ - $(LOCAL_PATH)/../../../../Source/ \ - $(LOCAL_PATH)/../../../../Source/XnCommon \ - -LOCAL_CFLAGS := -fvisibility=hidden -DXN_DEVICE_EXPORTS - -LOCAL_LDFLAGS += -Wl,--export-dynamic --dynamic-linker - -LOCAL_SHARED_LIBRARIES := OpenNI libusb XnCore XnFormats XnDDK - -LOCAL_PREBUILT_LIBS := libc - -LOCAL_MODULE := XnDeviceSensorV2 - -include $(BUILD_SHARED_LIBRARY) - diff --git a/Platform/Android/jni/XnFormats/Android.mk b/Platform/Android/jni/XnFormats/Android.mk deleted file mode 100644 index de31310..0000000 --- a/Platform/Android/jni/XnFormats/Android.mk +++ /dev/null @@ -1,39 +0,0 @@ -# XnFormats Android makefile. -# libXnFormats.so -# - -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -# set path to source -MY_PREFIX := $(LOCAL_PATH)/../../../../Source/XnFormats/ - -# list all source files -MY_SRC_FILES := \ - $(MY_PREFIX)*.cpp \ - $(MY_PREFIX)../External/LibJPEG/*.c - -# expand the wildcards -MY_SRC_FILE_EXPANDED := $(wildcard $(MY_SRC_FILES)) - -# make those paths relative to here -LOCAL_SRC_FILES := $(MY_SRC_FILE_EXPANDED:$(LOCAL_PATH)/%=%) - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../../../../Include/ \ - $(LOCAL_PATH)/../../../../Source/ \ - $(LOCAL_PATH)/../../../../Source/XnCommon \ - $(LOCAL_PATH)/../../../../Source/External/LibJPEG \ - -LOCAL_CFLAGS := -fvisibility=hidden -DXN_FORMATS_EXPORTS - -LOCAL_LDFLAGS += -Wl,--export-dynamic --dynamic-linker - -LOCAL_SHARED_LIBRARIES := OpenNI libusb XnCore - -LOCAL_PREBUILT_LIBS := libc - -LOCAL_MODULE := XnFormats - -include $(BUILD_SHARED_LIBRARY) - diff --git a/Platform/Linux/Build/Common/CommonCSMakefile b/Platform/Linux/Build/Common/CommonCSMakefile deleted file mode 100644 index 136e69d..0000000 --- a/Platform/Linux/Build/Common/CommonCSMakefile +++ /dev/null @@ -1,58 +0,0 @@ -############################################################################# -# Primesense template makefile. -# This file should not be made, but only included from other makefiles. -# By default, this makefile compiles in release. To compile a debug version: -# make CFG=Debug -# -# Project makefile should define the following BEFORE including this file: -# SRC_FILES - a list of all source files -# Output name under one of the following: -# NETLIB_NAME (.net module) or -# NETEXE_NAME (.net executable) -# BIN_DIR - Bin directory (output dir) -# INC_DIRS - a list of additional include directories -# USED_LIBS - a list of libraries to link with -# CSFLAGS - [Optional] additional flags for mono compiler -# NET_WIN_FORMS - [Optional] when 1, application uses WinForms -############################################################################# - -# take this file's dir -COMMON_CS_MAKE_FILE_DIR = $(dir $(lastword $(MAKEFILE_LIST))) - -include $(COMMON_CS_MAKE_FILE_DIR)CommonDefs.mak - -# create -r option to mcs -USED_NETLIBS_OPTION = $(foreach lib,$(USED_LIBS),-r:$(lib).dll) - -ifeq "$(NET_WIN_FORMS)" "1" - USED_NETLIBS_OPTION += -r:System.Windows.Forms.dll -r:System.Drawing.dll -endif - -# add the output dir as a place to search for assemblies -USED_NETLIBS_OPTION += -lib:$(OUT_DIR) - -ifeq "$(CFG)" "Release" - CSFLAGS += -o+ -endif - -# some lib / exe specifics -ifneq "$(NETLIB_NAME)" "" - OUTPUT_NAME = $(NETLIB_NAME).dll - TARGET = library -endif -ifneq "$(NETEXE_NAME)" "" - OUTPUT_NAME = $(NETEXE_NAME).exe - TARGET = winexe -endif - -OUTPUT_COMMAND = gmcs -out:$(OUTPUT_FILE) -target:$(TARGET) $(CSFLAGS) $(USED_NETLIBS_OPTION) $(SRC_FILES) - -############################################################################# -# Targets -############################################################################# -include $(COMMON_CS_MAKE_FILE_DIR)CommonTargets.mak - -# Final output file -$(OUTPUT_FILE): - $(OUTPUT_COMMAND) - diff --git a/Platform/Linux/Build/Common/CommonJavaMakefile b/Platform/Linux/Build/Common/CommonJavaMakefile deleted file mode 100644 index 5faffab..0000000 --- a/Platform/Linux/Build/Common/CommonJavaMakefile +++ /dev/null @@ -1,79 +0,0 @@ -############################################################################# -# Primesense template makefile. -# This file should not be made, but only included from other makefiles. -# By default, this makefile compiles in release. To compile a debug version: -# make CFG=Debug -# -# Project makefile should define the following BEFORE including this file: -# SRC_FILES - a list of all source files -# JAR_NAME - name of the package -# BIN_DIR - Bin directory (output dir) -# INC_DIRS - a list of additional include directories -# LIB_DIRS - a list of additional library directories -# USED_JARS - a list of libraries used -# MAIN_CLASS - [Optional] for executable jar -############################################################################# - -# take this file's dir -COMMON_CS_MAKE_FILE_DIR = $(dir $(lastword $(MAKEFILE_LIST))) - -include $(COMMON_CS_MAKE_FILE_DIR)CommonDefs.mak - -nullstring := -space := $(nullstring) # end of the line - -USED_JARS_OPTION = -ifneq "$(USED_JARS)" "" - USED_JARS_PATH = $(foreach jar, $(USED_JARS), $(OUT_DIR)/$(jar).jar /usr/share/java/$(jar).jar) - USED_JARS_OPTION = -cp $(subst $(space),:,$(strip $(USED_JARS_PATH))) -endif - -OUTPUT_NAME = $(JAR_NAME).jar - -# create manifest file if needed -JAR_MANIFEST_CREATE_COMMAND := -MANIFEST_FILE := -JAR_OPTIONS = -cf - -ifneq (, $(if $(or $(MAIN_CLASS), $(USED_JARS)),1)) - JAR_OPTIONS = -cfm - MANIFEST_FILE = Manifest.txt - JAR_MANIFEST_CREATE_COMMAND = ( - ifneq (,$(MAIN_CLASS)) - JAR_MANIFEST_CREATE_COMMAND += echo "Main-Class: $(MAIN_CLASS)"; - endif - ifneq (,$(USED_JARS)) - JAR_MANIFEST_CREATE_COMMAND += echo "Class-Path: $(USED_JARS_PATH)"; - endif - JAR_MANIFEST_CREATE_COMMAND += ) > $(MANIFEST_FILE) -endif - -CREATE_SHORTCUT = -ifneq (, $(MAIN_CLASS)) - SHORTCUT = $(OUT_DIR)/$(JAR_NAME) - CREATE_SHORTCUT = echo java -jar $(OUTPUT_NAME) > $(SHORTCUT); chmod +x $(SHORTCUT) -endif - -############################################################################# -# Targets -############################################################################# -include $(COMMON_CS_MAKE_FILE_DIR)CommonTargets.mak - -.PHONY: clean-manifest clean-int - -# Final output file -$(OUTPUT_FILE): | $(INT_DIR) - javac $(USED_JARS_OPTION) -d $(INT_DIR) $(SRC_FILES) - $(JAR_MANIFEST_CREATE_COMMAND) - jar $(JAR_OPTIONS) $@ $(MANIFEST_FILE) -C $(INT_DIR) . - $(CREATE_SHORTCUT) - -clean-manifest: - rm -rf $(MANIFEST_FILE) - -clean-int: - rm -rf $(INT_DIR) - -clean: clean-manifest clean-int - - diff --git a/Platform/Win32/Build/Engine.sln b/Platform/Win32/Build/Engine.sln deleted file mode 100644 index 82db0dd..0000000 --- a/Platform/Win32/Build/Engine.sln +++ /dev/null @@ -1,36 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{19091980-2008-4CFA-1491-04CC20D8BCF9}") = "XnCore", "XnCore\XnCore.vcproj", "{7410A46D-8120-4C95-B7B4-BC8AFEBBBD5A}" -EndProject -Project("{19091980-2008-4CFA-1491-04CC20D8BCF9}") = "XnFormats", "XnFormats\XnFormats.vcproj", "{9CAEC325-EEE6-4A91-8819-004E20C419C0}" - ProjectSection(ProjectDependencies) = postProject - {7410A46D-8120-4C95-B7B4-BC8AFEBBBD5A} = {7410A46D-8120-4C95-B7B4-BC8AFEBBBD5A} - EndProjectSection -EndProject -Project("{19091980-2008-4CFA-1491-04CC20D8BCF9}") = "XnDDK", "XnDDK\XnDDK.vcproj", "{FB08A9D1-10AF-418D-8786-F58FDF11254D}" - ProjectSection(ProjectDependencies) = postProject - {7410A46D-8120-4C95-B7B4-BC8AFEBBBD5A} = {7410A46D-8120-4C95-B7B4-BC8AFEBBBD5A} - {9CAEC325-EEE6-4A91-8819-004E20C419C0} = {9CAEC325-EEE6-4A91-8819-004E20C419C0} - EndProjectSection -EndProject -Project("{19091980-2008-4CFA-1491-04CC20D8BCF9}") = "XnDeviceSensorV2", "XnDeviceSensorV2\XnDeviceSensorV2.vcproj", "{1653839A-ABA5-4c0e-9EA2-2640B0275894}" - ProjectSection(ProjectDependencies) = postProject - {FB08A9D1-10AF-418D-8786-F58FDF11254D} = {FB08A9D1-10AF-418D-8786-F58FDF11254D} - {9CAEC325-EEE6-4A91-8819-004E20C419C0} = {9CAEC325-EEE6-4A91-8819-004E20C419C0} - {7410A46D-8120-4C95-B7B4-BC8AFEBBBD5A} = {7410A46D-8120-4C95-B7B4-BC8AFEBBBD5A} - EndProjectSection -EndProject -Project("{19091980-2008-4CFA-1491-04CC20D8BCF9}") = "Utils\XnSensorServer", "Utils\XnSensorServer\XnSensorServer.vcproj", "{F68C824E-EA49-4A3C-A233-ADE2B3ECC375}" - ProjectSection(ProjectDependencies) = postProject - {FB08A9D1-10AF-418D-8786-F58FDF11254D} = {FB08A9D1-10AF-418D-8786-F58FDF11254D} - {1653839A-ABA5-4c0e-9EA2-2640B0275894} = {1653839A-ABA5-4c0e-9EA2-2640B0275894} - {9CAEC325-EEE6-4A91-8819-004E20C419C0} = {9CAEC325-EEE6-4A91-8819-004E20C419C0} - EndProjectSection -EndProject -Project("{19091980-2008-4CFA-1491-04CC20D8BCF9}") = "XnDeviceFile", "XnDeviceFile\XnDeviceFile.vcproj", "{7410A46D-8120-4C95-B7B4-BC8AFEBBBD5B}" - ProjectSection(ProjectDependencies) = postProject - {7410A46D-8120-4C95-B7B4-BC8AFEBBBD5A} = {7410A46D-8120-4C95-B7B4-BC8AFEBBBD5A} - {FB08A9D1-10AF-418D-8786-F58FDF11254D} = {FB08A9D1-10AF-418D-8786-F58FDF11254D} - {9CAEC325-EEE6-4A91-8819-004E20C419C0} = {9CAEC325-EEE6-4A91-8819-004E20C419C0} - EndProjectSection -EndProject diff --git a/Platform/Win32/Build/Res/DDK.rc b/Platform/Win32/Build/Res/DDK.rc deleted file mode 100644 index 19326d8..0000000 --- a/Platform/Win32/Build/Res/DDK.rc +++ /dev/null @@ -1,123 +0,0 @@ -// Microsoft Visual C++ generated resource script. -// -#include "Resource-DDK.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" -#include - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Swedish resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_SVE) -#ifdef _WIN32 -LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "Resource-DDK.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - -#endif // Swedish resources -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// Hebrew resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_HEB) -#ifdef _WIN32 -LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT -#pragma code_page(1255) -#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_MAINICON ICON "mainicon.ico" - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION XN_PS_MAJOR_VERSION,XN_PS_MINOR_VERSION,XN_PS_MAINTENANCE_VERSION,XN_PS_BUILD_VERSION - PRODUCTVERSION XN_PS_MAJOR_VERSION,XN_PS_MINOR_VERSION,XN_PS_MAINTENANCE_VERSION,XN_PS_BUILD_VERSION - FILEFLAGSMASK 0x17L -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x4L - FILETYPE 0x0L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "000904b0" - BEGIN - VALUE "CompanyName", "Prime Sense Ltd." - VALUE "FileDescription", "Prime Sense Device Development Kit" - VALUE "FileVersion", XN_PS_BRIEF_VERSION_STRING - VALUE "InternalName", "PSDDK" - VALUE "LegalCopyright", "Copyright (C) 2007" - VALUE "ProductName", "Prime Sense Device Development Kit" - VALUE "ProductVersion", XN_PS_BRIEF_VERSION_STRING - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x9, 1200 - END -END - -#endif // Hebrew resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/Platform/Win32/Build/Res/Resource-DDK.h b/Platform/Win32/Build/Res/Resource-DDK.h deleted file mode 100644 index fb398c9..0000000 --- a/Platform/Win32/Build/Res/Resource-DDK.h +++ /dev/null @@ -1,37 +0,0 @@ -/**************************************************************************** -* * -* PrimeSense Sensor 5.x Alpha * -* Copyright (C) 2011 PrimeSense Ltd. * -* * -* This file is part of PrimeSense Sensor. * -* * -* PrimeSense Sensor is free software: you can redistribute it and/or modify* -* it under the terms of the GNU Lesser General Public License as published * -* by the Free Software Foundation, either version 3 of the License, or * -* (at your option) any later version. * -* * -* PrimeSense Sensor is distributed in the hope that it will be useful, * -* but WITHOUT ANY WARRANTY; without even the implied warranty of * -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * -* GNU Lesser General Public License for more details. * -* * -* You should have received a copy of the GNU Lesser General Public License * -* along with PrimeSense Sensor. If not, see .* -* * -****************************************************************************/ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by DDK.rc -// -#define IDI_MAINICON 110 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 116 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1016 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif diff --git a/Platform/Win32/Build/Res/mainicon.ico b/Platform/Win32/Build/Res/mainicon.ico deleted file mode 100644 index 1e1d312..0000000 Binary files a/Platform/Win32/Build/Res/mainicon.ico and /dev/null differ diff --git a/Platform/Win32/Build/Utils/XnSensorServer/XnSensorServer.vcproj b/Platform/Win32/Build/Utils/XnSensorServer/XnSensorServer.vcproj deleted file mode 100644 index 621a18f..0000000 --- a/Platform/Win32/Build/Utils/XnSensorServer/XnSensorServer.vcproj +++ /dev/null @@ -1,391 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Platform/Win32/Build/XnCore/XnCore.vcproj b/Platform/Win32/Build/XnCore/XnCore.vcproj deleted file mode 100644 index 78ac3a8..0000000 --- a/Platform/Win32/Build/XnCore/XnCore.vcproj +++ /dev/null @@ -1,515 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Platform/Win32/Build/XnDDK/XnDDK.vcproj b/Platform/Win32/Build/XnDDK/XnDDK.vcproj deleted file mode 100644 index 3e7666c..0000000 --- a/Platform/Win32/Build/XnDDK/XnDDK.vcproj +++ /dev/null @@ -1,853 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Platform/Win32/Build/XnDeviceFile/XnDeviceFile.vcproj b/Platform/Win32/Build/XnDeviceFile/XnDeviceFile.vcproj deleted file mode 100644 index 2172552..0000000 --- a/Platform/Win32/Build/XnDeviceFile/XnDeviceFile.vcproj +++ /dev/null @@ -1,477 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Platform/Win32/Build/XnDeviceSensorV2/XnDeviceSensorV2.vcproj b/Platform/Win32/Build/XnDeviceSensorV2/XnDeviceSensorV2.vcproj deleted file mode 100644 index cdca628..0000000 --- a/Platform/Win32/Build/XnDeviceSensorV2/XnDeviceSensorV2.vcproj +++ /dev/null @@ -1,999 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Platform/Win32/Build/XnFormats/XnFormats.vcproj b/Platform/Win32/Build/XnFormats/XnFormats.vcproj deleted file mode 100644 index 753f119..0000000 --- a/Platform/Win32/Build/XnFormats/XnFormats.vcproj +++ /dev/null @@ -1,2181 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Platform/Win32/CreateRedist/EE_NI/EE_NI.sln b/Platform/Win32/CreateRedist/EE_NI/EE_NI.sln deleted file mode 100644 index 29db4f2..0000000 --- a/Platform/Win32/CreateRedist/EE_NI/EE_NI.sln +++ /dev/null @@ -1,26 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "EE_NI", "EE_NI.wixproj", "{C48CADD9-CCFF-4819-A860-840FC26E90AE}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {C48CADD9-CCFF-4819-A860-840FC26E90AE}.Debug|x64.ActiveCfg = Debug|x64 - {C48CADD9-CCFF-4819-A860-840FC26E90AE}.Debug|x64.Build.0 = Debug|x64 - {C48CADD9-CCFF-4819-A860-840FC26E90AE}.Debug|x86.ActiveCfg = Debug|x86 - {C48CADD9-CCFF-4819-A860-840FC26E90AE}.Debug|x86.Build.0 = Debug|x86 - {C48CADD9-CCFF-4819-A860-840FC26E90AE}.Release|x64.ActiveCfg = Release|x64 - {C48CADD9-CCFF-4819-A860-840FC26E90AE}.Release|x64.Build.0 = Release|x64 - {C48CADD9-CCFF-4819-A860-840FC26E90AE}.Release|x86.ActiveCfg = Release|x86 - {C48CADD9-CCFF-4819-A860-840FC26E90AE}.Release|x86.Build.0 = Release|x86 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/Platform/Win32/CreateRedist/EE_NI/EE_NI.wixproj b/Platform/Win32/CreateRedist/EE_NI/EE_NI.wixproj deleted file mode 100644 index 07729b6..0000000 --- a/Platform/Win32/CreateRedist/EE_NI/EE_NI.wixproj +++ /dev/null @@ -1,86 +0,0 @@ - - - Debug - x86 - 3.5 - {c48cadd9-ccff-4819-a860-840fc26e90ae} - 2.0 - EE_NI - Package - $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets - $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets - - - bin\$(Configuration)\ - obj\$(Configuration)\ - Debug;EE_NIFilesDir=..\..\..\..\Redist - -arch x86 - - - bin\$(Configuration)\ - obj\$(Configuration)\ - EE_NIFilesDir=..\..\..\..\Redist - -arch x86 - - - Debug;EE_NIFilesDir=..\..\..\..\..\Redist - bin\$(Configuration)\ - obj\$(Platform)\$(Configuration)\ - -arch x64 - - - EE_NIFilesDir=..\..\..\..\..\Redist - bin\$(Configuration)\ - obj\$(Platform)\$(Configuration)\ - -arch x64 - - - - - - - - - - - - - - - - - - - - - - - - - - $(WixExtDir)\WixUtilExtension.dll - WixUtilExtension - - - $(WixExtDir)\WixUIExtension.dll - WixUIExtension - - - $(WixExtDir)\WixNetFxExtension.dll - WixNetFxExtension - - - - - - "$(WIX)bin\heat.exe" dir "..\..\..\..\Redist" -cg EE_NIFiles -gg -scom -sreg -sfrag -srd -dr INSTALLLOCATION -var var.EE_NIFilesDir -out "$(ProjectDir)Fragments\FilesFragment.wxs" - "$(WIX)bin\setupbld.exe" -out EE_NI_setup.exe -msu "!(TargetPath)" -setup "$(ProjectDir)setup.exe" -title "EE_NI setup" - - \ No newline at end of file diff --git a/Platform/Win32/CreateRedist/EE_NI/EE_NI.wxs b/Platform/Win32/CreateRedist/EE_NI/EE_NI.wxs deleted file mode 100644 index f9460c2..0000000 --- a/Platform/Win32/CreateRedist/EE_NI/EE_NI.wxs +++ /dev/null @@ -1,366 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - NOT Installed - - - Not Installed - NOT Installed - NOT Installed - NOT Installed - NOT Installed - - - - REMOVE ~= "ALL" - REMOVE ~= "ALL" - - - - - - - - - - - - - - - - - diff --git a/Platform/Win32/CreateRedist/EE_NI/Fragments/BinariesFragment.wxs b/Platform/Win32/CreateRedist/EE_NI/Fragments/BinariesFragment.wxs deleted file mode 100644 index 248bbfb..0000000 --- a/Platform/Win32/CreateRedist/EE_NI/Fragments/BinariesFragment.wxs +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Platform/Win32/CreateRedist/EE_NI/Includes/EENIVariables.wxi b/Platform/Win32/CreateRedist/EE_NI/Includes/EENIVariables.wxi deleted file mode 100644 index 1b81c51..0000000 --- a/Platform/Win32/CreateRedist/EE_NI/Includes/EENIVariables.wxi +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Platform/Win32/CreateRedist/EE_NI/Includes/EENIVariables.wxi.bak b/Platform/Win32/CreateRedist/EE_NI/Includes/EENIVariables.wxi.bak deleted file mode 100644 index 3f0c9f2..0000000 --- a/Platform/Win32/CreateRedist/EE_NI/Includes/EENIVariables.wxi.bak +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Platform/Win32/CreateRedist/EE_NI/Lang/en-us/Loc_en-us.wxl b/Platform/Win32/CreateRedist/EE_NI/Lang/en-us/Loc_en-us.wxl deleted file mode 100644 index 639ec5d..0000000 --- a/Platform/Win32/CreateRedist/EE_NI/Lang/en-us/Loc_en-us.wxl +++ /dev/null @@ -1,15 +0,0 @@ - - - 1033 - - PrimeSense Sensor KinectMod - for Windows - for Windows 64-bit - Sensor - - PrimeSense - This application is is not supported on your current OS. Minimal OS supported is Windows XP SP2 - .NET Framework 2.0 is required. Please install the .NET Framework then run this installer again. - A newer version of !(loc.ProductName) is already installed. - Choose the folder in which to install !(loc.ProductName) - \ No newline at end of file diff --git a/Platform/Win32/CreateRedist/EE_NI/Resources/Header.bmp b/Platform/Win32/CreateRedist/EE_NI/Resources/Header.bmp deleted file mode 100644 index 4caa2e7..0000000 Binary files a/Platform/Win32/CreateRedist/EE_NI/Resources/Header.bmp and /dev/null differ diff --git a/Platform/Win32/CreateRedist/EE_NI/Resources/mainicon.ico b/Platform/Win32/CreateRedist/EE_NI/Resources/mainicon.ico deleted file mode 100644 index 1e1d312..0000000 Binary files a/Platform/Win32/CreateRedist/EE_NI/Resources/mainicon.ico and /dev/null differ diff --git a/Platform/Win32/CreateRedist/EE_NI/UI/CustomeInstallUI.wxs b/Platform/Win32/CreateRedist/EE_NI/UI/CustomeInstallUI.wxs deleted file mode 100644 index c3782a5..0000000 --- a/Platform/Win32/CreateRedist/EE_NI/UI/CustomeInstallUI.wxs +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - 1 - - - - - - - - - - - - - - - - - - - - - - 1 - - 1 - - 1 - 1 - - 1 - - 1 - 1 - 1 - - - - - NOT Installed - - - - - \ No newline at end of file diff --git a/Platform/Win32/CreateRedist/EE_NI/checkVersion.vbs b/Platform/Win32/CreateRedist/EE_NI/checkVersion.vbs deleted file mode 100644 index 9febe02..0000000 --- a/Platform/Win32/CreateRedist/EE_NI/checkVersion.vbs +++ /dev/null @@ -1,24 +0,0 @@ -Function CheckVersionNI() - set WSHShell = CreateObject("WScript.Shell") - arrMinVersion = Split("1.2.0.4", ".") - currOpenNiVer = Session.Property("OPENNIVERSION") - - if currOpenNiVer = "" Then - WSHShell.PopUp("Please install OpenNI version 1.2.0.4 or higher!") - CheckVersionNI = 3 - Exit Function - End If - arrCurrOpenNiVer = Split(currOpenNiVer, ".") - - For index = 0 to 4 - if CInt(arrMinVersion(index)) > CInt(arrCurrOpenNiVer(index)) Then - WSHShell.PopUp("Please install OpenNI version 1.2.0.4 and higher!") - CheckVersionNI = 3 - Exit Function - ElseIf CInt(arrMinVersion(index)) < CInt(arrCurrOpenNiVer(index)) Then - CheckVersionNI = 0 - Exit Function - End If - Next - CheckVerionNI = 0 -End Function \ No newline at end of file diff --git a/Platform/Win32/CreateRedist/EE_NI/setup.exe b/Platform/Win32/CreateRedist/EE_NI/setup.exe deleted file mode 100644 index a7b1b74..0000000 Binary files a/Platform/Win32/CreateRedist/EE_NI/setup.exe and /dev/null differ diff --git a/Platform/Win32/CreateRedist/Engine_Config.xml b/Platform/Win32/CreateRedist/Engine_Config.xml deleted file mode 100644 index 5291a51..0000000 --- a/Platform/Win32/CreateRedist/Engine_Config.xml +++ /dev/null @@ -1,8 +0,0 @@ - - EngineWin32 - WIN32 - 5.1.2 - ..\..\..\ - \Platform\Win32\Build\EngineWin32.sln - \Platform\Win32\Redist\Samples\Build\All_2008.sln - diff --git a/Platform/Win32/CreateRedist/Redist.py b/Platform/Win32/CreateRedist/Redist.py deleted file mode 100644 index 38b5ea7..0000000 --- a/Platform/Win32/CreateRedist/Redist.py +++ /dev/null @@ -1,279 +0,0 @@ -#/*************************************************************************** -#* * -#* PrimeSense Sensor 5.x Alpha * -#* Copyright (C) 2011 PrimeSense Ltd. * -#* * -#* This file is part of PrimeSense Sensor. * -#* * -#* PrimeSense Sensor is free software: you can redistribute it and/or modif* -#* it under the terms of the GNU Lesser General Public License as published* -#* by the Free Software Foundation, either version 3 of the License, or * -#* (at your option) any later version. * -#* * -#* PrimeSense Sensor is distributed in the hope that it will be useful, * -#* but WITHOUT ANY WARRANTY; without even the implied warranty of * -#* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * -#* GNU Lesser General Public License for more details. * -#* * -#* You should have received a copy of the GNU Lesser General Public License* -#* along with PrimeSense Sensor. If not, see * -#* * -#***************************************************************************/ -# - -# -import os -import sys -import shutil -import win32con, pywintypes, win32api -import re -import subprocess -from xml.dom.minidom import parse, parseString -import platform - -def is_64_bit_platform(): - result = False - import platform - (bits,linkage) = platform.architecture() - matchObject = re.search('64',bits) - result = matchObject is not None - return result - -is_64_bit_platform = is_64_bit_platform() - - - -#------------Check args---------------------------------------------# - -Make_Doxy=1 -vc_build_bits = "32" -vc_build_type = "/Rebuild" -VC_version = 9 - -if len(sys.argv) in [4,5]: - if sys.argv[1] == 'n': - Make_Doxy=0 - if sys.argv[2] == '64': - vc_build_bits = "64" - if sys.argv[3] == 'n': - vc_build_type = "/Build" - if len(sys.argv) > 4: - if sys.argv[4] == '10': - VC_version = 10 - -CONFIG_XML = parse("Engine_Config.xml") -SDK_VER = str(CONFIG_XML.getElementsByTagName("VERSION_NUMBER")[0].firstChild.data) - -output_dir__ = 'Output'+vc_build_bits -final_dir__ = 'Final'+vc_build_bits - -ROOT_DIR = os.path.abspath(os.path.dirname(sys.argv[0])) -REDIST_DIR = os.path.join(ROOT_DIR, "..", "Redist") -OUTPUT_DIR = os.path.join(ROOT_DIR, output_dir__) -path2final = os.path.join(ROOT_DIR,final_dir__) -SCRIPT_DIR = os.getcwd() - -print('work dir of redist.py:') -print(SCRIPT_DIR) - -def finish_script(exit_code): - os.chdir(SCRIPT_DIR) - #logging.shutdown() - exit(exit_code) - -def regx_replace(findStr,repStr,filePath): - "replaces all findStr by repStr in file filePath using regualr expression" - findStrRegx = re.compile(findStr) - tempName=filePath+'~~~' - input = open(filePath) - output = open(tempName,'w') - for s in input: - output.write(findStrRegx.sub(repStr,s)) - output.close() - input.close() - os.remove(filePath) - os.rename(tempName,filePath) - -def get_reg_values(reg_key, value_list): - # open the reg key - try: - reg_key = win32api.RegOpenKeyEx(*reg_key) - except pywintypes.error as e: - raise Exception("Failed to open registry key!") - # Get the values - try: - values = [(win32api.RegQueryValueEx(reg_key, name), data_type) for name, data_type in value_list] - # values list of ((value, type), expected_type) - for (value, data_type), expected in values: - if data_type != expected: - raise Exception("Bad registry value type! Expected %d, got %d instead." % (expected, data_type)) - # values okay, leave only values - values = [value for ((value, data_type), expected) in values] - except pywintypes.error as e: - raise Exception("Failed to get registry value!") - finally: - try: - win32api.RegCloseKey(reg_key) - except pywintypes.error as e: - # We don't care if reg key close failed... - pass - return tuple(values) - - - - -# remove output dir -if os.path.exists(REDIST_DIR): - os.system("rmdir /S /Q \"" + REDIST_DIR + "\"") -if os.path.exists(OUTPUT_DIR): - os.system("rmdir /S /Q \"" + OUTPUT_DIR + "\"") -os.mkdir(REDIST_DIR) -os.mkdir(OUTPUT_DIR) -if not os.path.exists(path2final): - os.makedirs(path2final) - -try: - VS_NEED_UPGRADE = 0 - if not is_64_bit_platform: - MSVC_KEY = (win32con.HKEY_LOCAL_MACHINE, r"SOFTWARE\Microsoft\VisualStudio\9.0") - else: - MSVC_KEY = (win32con.HKEY_LOCAL_MACHINE, r"SOFTWARE\Wow6432Node\Microsoft\VisualStudio\9.0") - #MSVC_KEY = (win32con.HKEY_LOCAL_MACHINE, r"SOFTWARE\Wow6432Node\Microsoft\VisualStudio\9.0") - MSVC_VALUES = [("InstallDir", win32con.REG_SZ)] - VS_INST_DIR = get_reg_values(MSVC_KEY, MSVC_VALUES)[0] -except Exception as e: - VC_version = 10 - -if VC_version == 10: - VS_NEED_UPGRADE = 1 - if not is_64_bit_platform: - MSVC_KEY = (win32con.HKEY_LOCAL_MACHINE, r"SOFTWARE\Microsoft\VisualStudio\10.0") - else: - MSVC_KEY = (win32con.HKEY_LOCAL_MACHINE, r"SOFTWARE\Wow6432Node\Microsoft\VisualStudio\10.0") - MSVC_VALUES = [("InstallDir", win32con.REG_SZ)] - VS_INST_DIR = get_reg_values(MSVC_KEY, MSVC_VALUES)[0] - -# build -print("Building...") - -os.chdir(os.path.join(ROOT_DIR, "..", "Build")) - -out_file = os.path.join('..\\CreateRedist',output_dir__,'build.log') -if VS_NEED_UPGRADE == 1: - #os.system("attrib -r * /s") - res = os.system("\"" + VS_INST_DIR + "devenv\" " + "Engine.sln" + " /upgrade > " + out_file) - if res != 0: - raise Exception("build failed!") -build_cmd = "\"%s\" %s /Rebuild \"release|%s\" /out %s"%(os.path.join(VS_INST_DIR,'devenv'),'Engine.sln', - 'win32' if vc_build_bits == '32' else 'x64',out_file) -#build_cmd = "\"%s\" %s /Rebuild \"Release|x%s\""%(os.path.join(VS_INST_DIR,'devenv.exe'),'Engine.sln', -# '86' if vc_build_bits == '32' else '64') -print(('building .. %s'%build_cmd)) -#res = os.system("\"" + VS_INST_DIR + "devenv\" " + "Engine.sln" + " /build Release > ..\\CreateRedist\\Output\\build.log") -#res = os.system(build_cmd) -res = subprocess.call(build_cmd) -res = 0 -if res != 0: - raise Exception("build failed!") -os.chdir(SCRIPT_DIR) - -print("Copying into redist folder...") - -# create folder structure -os.mkdir(os.path.join(REDIST_DIR, "Bin" if vc_build_bits == "32" else "Bin64")) -os.mkdir(os.path.join(REDIST_DIR, "Data")) -#--avin mod -os.mkdir(os.path.join(REDIST_DIR, "Driver")) -os.mkdir(os.path.join(REDIST_DIR, "Driver", "amd64")) -os.mkdir(os.path.join(REDIST_DIR, "Driver", "x86")) - -# copy EPL -shutil.copy(os.path.join(ROOT_DIR, "..", "..", "..", "GPL.txt"), REDIST_DIR) -shutil.copy(os.path.join(ROOT_DIR, "..", "..", "..", "GPL.txt"), OUTPUT_DIR) -shutil.copy(os.path.join(ROOT_DIR, "..", "..", "..", "LGPL.txt"), REDIST_DIR) -shutil.copy(os.path.join(ROOT_DIR, "..", "..", "..", "LGPL.txt"), OUTPUT_DIR) - -# copy binaries -RELEASE_DIR = os.path.join(ROOT_DIR, "..", "Bin" if vc_build_bits == "32" else "Bin64", "Release") -for file in os.listdir(RELEASE_DIR): - if os.path.splitext(file)[1] in [".dll", ".exe"]: - shutil.copy(os.path.join(RELEASE_DIR, file), os.path.join(REDIST_DIR, "Bin" if vc_build_bits == "32" else "Bin64")) - -# copy data -DATA_DIR = os.path.join(ROOT_DIR, "..", "..", "..", "Data") -for file in os.listdir(DATA_DIR): - shutil.copy(os.path.join(DATA_DIR, file), os.path.join(REDIST_DIR, "Data")) - -#if vc_build_bits == '64': -# print 'Finishing without creating the installer' -# exit(0) - -#--avin mod -# copy driver -DRIVER_DIR = os.path.join(ROOT_DIR, "..", "Driver") -for file in os.listdir(DRIVER_DIR): - try: - shutil.copy(os.path.join(DRIVER_DIR, file), os.path.join(REDIST_DIR, "Driver")) - except IOError: - pass - -DRIVER_DIRX86 = os.path.join(ROOT_DIR, "..", "Driver", "x86") -for file in os.listdir(DRIVER_DIRX86): - shutil.copy(os.path.join(DRIVER_DIRX86, file), os.path.join(REDIST_DIR, "Driver", "x86")) - -DRIVER_DIRAMD64 = os.path.join(ROOT_DIR, "..", "Driver", "amd64") -for file in os.listdir(DRIVER_DIRAMD64): - shutil.copy(os.path.join(DRIVER_DIRAMD64, file), os.path.join(REDIST_DIR, "Driver", "amd64")) - -# create installer -print("Creating installer...") -os.chdir(SCRIPT_DIR + "\\EE_NI") -#print "* move XnLeanDeviceSensorV2.dll" -#os.system("move /Y " + WORK_DIR + "\\Platform\\Win32\\Bin\\XnLeanDeviceSensorV2.dll \\Platform\\Win32\\Bin\\XnDeviceSensorV2.dll") - -print("* Set BinaryOnlyRedist=True") -os.system("attrib -r Includes\\EENIVariables.wxi") -regx_replace("BinaryOnlyRedist=(.*)", "BinaryOnlyRedist=True?>", "Includes\\EENIVariables.wxi") - -logFilename = "BuildEngine" - - - -print("* Build EE_NI.wixproj") - -wix_out_file = os.path.join(SCRIPT_DIR,output_dir__, logFilename + ".txt") -if VS_NEED_UPGRADE == 1: - res = subprocess.call("\""+VS_INST_DIR + "devenv\" EE_NI.sln /upgrade /out %s"%wix_out_file,close_fds=True) - if res != 0: - raise Exception("Failed upgrade installer!") - - -wix_build_cmd = '"%s" %s /Build "release|%s" /out %s'%(os.path.join(VS_INST_DIR,'devenv'), 'EE_NI.wixproj' ,'x86' if vc_build_bits == '32' else 'x64', - wix_out_file) -print(("wix_build_cmd=%s"%wix_build_cmd)) -res = subprocess.call(wix_build_cmd) -#res = subprocess.call("\""+VS_INST_DIR + "devenv\" EE_NI.wixproj /build \"release|x86"\ -# +"\" /out "+SCRIPT_DIR+"\\Output\\" + logFilename + ".txt",close_fds=True) -if res != 0: - raise Exception("Failed creating installer!") - -currDir = os.getcwd() -print(currDir) -target_path = os.path.join(SCRIPT_DIR, final_dir__,"Sensor-Win-OpenSource" + str(vc_build_bits) + "-" + SDK_VER + ".msi") -moveCmd = "move bin\\Release\\en-US\\EE_NI.msi %s"%target_path -print((moveCmd + "...")) -os.system(moveCmd) -#print "* Move installers" -#os.system("move .\\Output\\*.msi " + SCRIPT_DIR + "\\Output") - -#NSIS_KEY = (win32con.HKEY_LOCAL_MACHINE, r"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\NSIS") -#NSIS_VALUES = [("InstallLocation", win32con.REG_EXPAND_SZ)] -#NSIS_INST_DIR = get_reg_values(NSIS_KEY, NSIS_VALUES)[0] -# make installer -#os.chdir(ROOT_DIR) -#res = os.system("\"" + NSIS_INST_DIR + "\\makensis.exe\" " + "Engine.nsi" + " > ..\\CreateRedist\\Output\\nsis.log") -#if res != 0: - #raise Exception("Failed creating installer!") - -print("Done.") -finish_script(0) diff --git a/Platform/Win32/Driver/amd64/WdfCoInstaller01009.dll b/Platform/Win32/Driver/amd64/WdfCoInstaller01009.dll deleted file mode 100644 index 1731b96..0000000 Binary files a/Platform/Win32/Driver/amd64/WdfCoInstaller01009.dll and /dev/null differ diff --git a/Platform/Win32/Driver/amd64/psdrv3.sys b/Platform/Win32/Driver/amd64/psdrv3.sys deleted file mode 100644 index d83c22b..0000000 Binary files a/Platform/Win32/Driver/amd64/psdrv3.sys and /dev/null differ diff --git a/Platform/Win32/Driver/dpinst-amd64.exe b/Platform/Win32/Driver/dpinst-amd64.exe deleted file mode 100644 index 0096441..0000000 Binary files a/Platform/Win32/Driver/dpinst-amd64.exe and /dev/null differ diff --git a/Platform/Win32/Driver/dpinst-x86.exe b/Platform/Win32/Driver/dpinst-x86.exe deleted file mode 100644 index 410a135..0000000 Binary files a/Platform/Win32/Driver/dpinst-x86.exe and /dev/null differ diff --git a/Platform/Win32/Driver/dpinst.xml b/Platform/Win32/Driver/dpinst.xml deleted file mode 100644 index cc0ff24..0000000 --- a/Platform/Win32/Driver/dpinst.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - PrimeSense Sensor Device Driver Installer - - Welcome to the PrimeSense Sensor Device Driver Installer! - This wizard will walk you through updating the drivers for your PrimeSense Sensor device. - - Installing the software for your PrimeSense Sensor device... - - Congratulations! You have finished installing your PrimeSense Sensor device drivers! - - psdrv3.ico - diff --git a/Platform/Win32/Driver/psdrv3.cat b/Platform/Win32/Driver/psdrv3.cat deleted file mode 100644 index 0dca907..0000000 Binary files a/Platform/Win32/Driver/psdrv3.cat and /dev/null differ diff --git a/Platform/Win32/Driver/psdrv3.ico b/Platform/Win32/Driver/psdrv3.ico deleted file mode 100644 index 1e1d312..0000000 Binary files a/Platform/Win32/Driver/psdrv3.ico and /dev/null differ diff --git a/Platform/Win32/Driver/psdrv3.inf b/Platform/Win32/Driver/psdrv3.inf deleted file mode 100644 index 84605b6..0000000 --- a/Platform/Win32/Driver/psdrv3.inf +++ /dev/null @@ -1,191 +0,0 @@ -;/**************************************************************************** -;* * -;* PrimeSense Sensor Device Driver v3.x INF * -;* * -;* Author: Ziv Hendel * -;* * -;* Copyright (C) 2006 PrimeSense Ltd. All Rights Reserved. * -;* * -;* This file has been provided pursuant to a License Agreement containing * -;* restrictions on its use. This data contains valuable trade secrets * -;* and proprietary information of PrimeSense Inc. and is protected by law. * -;* * -;****************************************************************************/ -; -; Modded by avin to support the Kinect. -; - -; ================= Version section =================== - -[Version] -Signature="$WINDOWS NT$" -Class=PrimeSense -ClassGuid={dce97d75-aef7-1980-1909-531357633222} -Provider=%PS% -DriverVer=05/22/2012,3.1.3.1 -CatalogFile=psdrv3.cat - -; ================= Class section ===================== - -[ClassInstall32] -Addreg=PrimeSenseClassReg - -[PrimeSenseClassReg] -HKR,,,0,%ClassName% -HKR,,Icon,,"-20" - -; ================= Device section ===================== - -[DestinationDirs] -DefaultDestDir = 12 ; Driver Dir - -[Manufacturer] -%MfgName%=PrimeSense,NTx86,NTamd64 - -[PrimeSense.NTx86] -%USB\VID_1D27&PID_0200.DeviceDesc%=psdrv3.Dev, USB\VID_1D27&PID_0200&MI_00 -%USB\VID_1D27&PID_0200.DeviceDesc%=psdrv3.Dev, USB\VID_1D27&PID_0200 -%USB\VID_1D27&PID_0300.DeviceDesc%=psdrv3.Dev, USB\VID_1D27&PID_0300&MI_00 -%USB\VID_1D27&PID_0300.DeviceDesc%=psdrv3.Dev, USB\VID_1D27&PID_0300 -%USB\VID_1D27&PID_0400.DeviceDesc%=psdrv3.Dev, USB\VID_1D27&PID_0400&MI_00 -%USB\VID_1D27&PID_0400.DeviceDesc%=psdrv3.Dev, USB\VID_1D27&PID_0400 -%USB\VID_1D27&PID_0500.DeviceDesc%=psdrv3.Dev, USB\VID_1D27&PID_0500&MI_00 -%USB\VID_1D27&PID_0500.DeviceDesc%=psdrv3.Dev, USB\VID_1D27&PID_0500 -%USB\VID_1D27&PID_0600.DeviceDesc%=psdrv3.Dev, USB\VID_1D27&PID_0600&MI_00 -%USB\VID_1D27&PID_0600.DeviceDesc%=psdrv3.Dev, USB\VID_1D27&PID_0600 -%USB\VID_1D27&PID_0600.DeviceDesc%=psdrv3.Dev, USB\VID_1D27&PID_0601&MI_00 -%USB\VID_1D27&PID_1280.DeviceDesc%=psdrv3.Dev, USB\VID_1D27&PID_1280&MI_00 -%USB\VID_1D27&PID_1280.DeviceDesc%=psdrv3.Dev, USB\VID_1D27&PID_1280 -%USB\VID_1D27&PID_2100.DeviceDesc%=psdrv3.Dev, USB\VID_1D27&PID_2100&MI_00 -%USB\VID_1D27&PID_2100.DeviceDesc%=psdrv3.Dev, USB\VID_1D27&PID_2100 -%USB\VID_1D27&PID_2200.DeviceDesc%=psdrv3.Dev, USB\VID_1D27&PID_2200&MI_00 -%USB\VID_1D27&PID_2200.DeviceDesc%=psdrv3.Dev, USB\VID_1D27&PID_2200 -%USB\VID_1D27&PID_F9DB.DeviceDesc%=psdrv3.Dev, USB\VID_1D27&PID_F9DB&MI_00 -%USB\VID_1D27&PID_F9DB.DeviceDesc%=psdrv3.Dev, USB\VID_1D27&PID_F9DB -%USB\VID_045E&PID_02B0.DeviceDesc%=psdrv3.Dev, USB\VID_045E&PID_02B0&MI_00 -%USB\VID_045E&PID_02B0.DeviceDesc%=psdrv3.Dev, USB\VID_045E&PID_02B0 -%USB\VID_045E&PID_02AD.DeviceDesc%=psdrv3.Dev, USB\VID_045E&PID_02AD&MI_00 -%USB\VID_045E&PID_02AD.DeviceDesc%=psdrv3.Dev, USB\VID_045E&PID_02AD -%USB\VID_045E&PID_02AE.DeviceDesc%=psdrv3.Dev, USB\VID_045E&PID_02AE&MI_00 -%USB\VID_045E&PID_02AE.DeviceDesc%=psdrv3.Dev, USB\VID_045E&PID_02AE -%USB\VID_045E&PID_02BE.DeviceDesc%=psdrv3.Dev, USB\VID_045E&PID_02BE&MI_00 -%USB\VID_045E&PID_02BE.DeviceDesc%=psdrv3.Dev, USB\VID_045E&PID_02BE -%USB\VID_045E&PID_02BF.DeviceDesc%=psdrv3.Dev, USB\VID_045E&PID_02BF&MI_00 -%USB\VID_045E&PID_02BF.DeviceDesc%=psdrv3.Dev, USB\VID_045E&PID_02BF - -[PrimeSense.NTamd64] -%USB\VID_1D27&PID_0200.DeviceDesc%=psdrv3.Dev, USB\VID_1D27&PID_0200&MI_00 -%USB\VID_1D27&PID_0200.DeviceDesc%=psdrv3.Dev, USB\VID_1D27&PID_0200 -%USB\VID_1D27&PID_0300.DeviceDesc%=psdrv3.Dev, USB\VID_1D27&PID_0300&MI_00 -%USB\VID_1D27&PID_0300.DeviceDesc%=psdrv3.Dev, USB\VID_1D27&PID_0300 -%USB\VID_1D27&PID_0400.DeviceDesc%=psdrv3.Dev, USB\VID_1D27&PID_0400&MI_00 -%USB\VID_1D27&PID_0400.DeviceDesc%=psdrv3.Dev, USB\VID_1D27&PID_0400 -%USB\VID_1D27&PID_0500.DeviceDesc%=psdrv3.Dev, USB\VID_1D27&PID_0500&MI_00 -%USB\VID_1D27&PID_0500.DeviceDesc%=psdrv3.Dev, USB\VID_1D27&PID_0500 -%USB\VID_1D27&PID_0600.DeviceDesc%=psdrv3.Dev, USB\VID_1D27&PID_0600&MI_00 -%USB\VID_1D27&PID_0600.DeviceDesc%=psdrv3.Dev, USB\VID_1D27&PID_0600 -%USB\VID_1D27&PID_0600.DeviceDesc%=psdrv3.Dev, USB\VID_1D27&PID_0601&MI_00 -%USB\VID_1D27&PID_1280.DeviceDesc%=psdrv3.Dev, USB\VID_1D27&PID_1280&MI_00 -%USB\VID_1D27&PID_1280.DeviceDesc%=psdrv3.Dev, USB\VID_1D27&PID_1280 -%USB\VID_1D27&PID_2100.DeviceDesc%=psdrv3.Dev, USB\VID_1D27&PID_2100&MI_00 -%USB\VID_1D27&PID_2100.DeviceDesc%=psdrv3.Dev, USB\VID_1D27&PID_2100 -%USB\VID_1D27&PID_2200.DeviceDesc%=psdrv3.Dev, USB\VID_1D27&PID_2200&MI_00 -%USB\VID_1D27&PID_2200.DeviceDesc%=psdrv3.Dev, USB\VID_1D27&PID_2200 -%USB\VID_1D27&PID_F9DB.DeviceDesc%=psdrv3.Dev, USB\VID_1D27&PID_F9DB&MI_00 -%USB\VID_1D27&PID_F9DB.DeviceDesc%=psdrv3.Dev, USB\VID_1D27&PID_F9DB -%USB\VID_045E&PID_02B0.DeviceDesc%=psdrv3.Dev, USB\VID_045E&PID_02B0&MI_00 -%USB\VID_045E&PID_02B0.DeviceDesc%=psdrv3.Dev, USB\VID_045E&PID_02B0 -%USB\VID_045E&PID_02AD.DeviceDesc%=psdrv3.Dev, USB\VID_045E&PID_02AD&MI_00 -%USB\VID_045E&PID_02AD.DeviceDesc%=psdrv3.Dev, USB\VID_045E&PID_02AD -%USB\VID_045E&PID_02AE.DeviceDesc%=psdrv3.Dev, USB\VID_045E&PID_02AE&MI_00 -%USB\VID_045E&PID_02AE.DeviceDesc%=psdrv3.Dev, USB\VID_045E&PID_02AE -%USB\VID_045E&PID_02BE.DeviceDesc%=psdrv3.Dev, USB\VID_045E&PID_02BE&MI_00 -%USB\VID_045E&PID_02BE.DeviceDesc%=psdrv3.Dev, USB\VID_045E&PID_02BE -%USB\VID_045E&PID_02BF.DeviceDesc%=psdrv3.Dev, USB\VID_045E&PID_02BF&MI_00 -%USB\VID_045E&PID_02BF.DeviceDesc%=psdrv3.Dev, USB\VID_045E&PID_02BF - -[psdrv3.Dev.NT] -CopyFiles=psdrv3.Files.Ext - -[psdrv3.Dev.NT.Services] -Addservice = psdrv3, 0x00000002, psdrv3.AddService - -[psdrv3.AddService] -DisplayName = %psdrv3.SvcDesc% -ServiceType = 1 ; SERVICE_KERNEL_DRIVER -StartType = 3 ; SERVICE_DEMAND_START -ErrorControl = 1 ; SERVICE_ERROR_NORMAL -ServiceBinary = %10%\System32\Drivers\psdrv3.sys -AddReg = psdrv3.AddReg -LoadOrderGroup = Base - -[psdrv3.AddReg] -HKR,"Parameters","MaximumTransferSize",0x10001,65536 -HKR,"Parameters","DebugLevel",0x10001,2 -HKR,"Parameters","RemovableIcon",0x10001,0 - -[psdrv3.Files.Ext] -psdrv3.sys - -[SourceDisksNames.x86] -1=%Disk_Description%,,,\x86 - -[SourceDisksNames.amd64] -2=%Disk_Description%,,,\amd64 - -[SourceDisksFiles.x86] -psdrv3.sys = 1 - -[SourceDisksFiles.amd64] -psdrv3.sys = 2 - -; ================= WDF section ===================== - -[DestinationDirs] -CoInstaller_CopyFiles = 11 ; System Dir - -[psdrv3.Dev.NT.CoInstallers] -AddReg=CoInstaller_AddReg -CopyFiles=CoInstaller_CopyFiles - -[CoInstaller_CopyFiles] -WdfCoInstaller01009.dll - -[SourceDisksFiles.x86] -WdfCoInstaller01009.dll=1 - -[SourceDisksFiles.amd64] -WdfCoInstaller01009.dll=2 - -[CoInstaller_AddReg] -HKR,,CoInstallers32,0x00010000, "WdfCoInstaller01009.dll,WdfCoInstaller" - -[psdrv3.Dev.NT.Wdf] -KmdfService = psdrv3, psdrv3_wdfsect - -[psdrv3_wdfsect] -KmdfLibraryVersion = 1.9 - -; ================= Strings section ===================== - -[Strings] -PS = "PrimeSense" -MfgName = "PrimeSense Ltd." -Disk_Description= "PrimeSense Sensor Device Driver Installation Disk v3.x" -psdrv3.SvcDesc = "PrimeSense Sensor Device Driver Service v3.x" -ClassName = "PrimeSense" -USB\VID_1D27&PID_0200.DeviceDesc="PrimeSense Sensor Development Kit 2.x" -USB\VID_1D27&PID_0300.DeviceDesc="PrimeSense Sensor Development Kit 3.x" -USB\VID_1D27&PID_0400.DeviceDesc="PrimeSense Sensor Development Kit 4.x" -USB\VID_1D27&PID_0500.DeviceDesc="PrimeSense Sensor Development Kit 5.x" -USB\VID_1D27&PID_0600.DeviceDesc="PrimeSense PS1080" -USB\VID_1D27&PID_0601.DeviceDesc="PrimeSense PS1080" -USB\VID_1D27&PID_1280.DeviceDesc="PrimeSense RD 1.28" -USB\VID_1D27&PID_2100.DeviceDesc="PrimeSense Sensor Development Kit NG 2100" -USB\VID_1D27&PID_2200.DeviceDesc="PrimeSense Sensor Development Kit NG 2200" -USB\VID_1D27&PID_F9DB.DeviceDesc="PrimeSense Sensor Development Kit NG Debug" -USB\VID_045E&PID_02B0.DeviceDesc="Kinect Motor" -USB\VID_045E&PID_02AD.DeviceDesc="Kinect Audio" -USB\VID_045E&PID_02AE.DeviceDesc="Kinect Camera" -USB\VID_045E&PID_02BE.DeviceDesc="Kinect4Windows Audio" -USB\VID_045E&PID_02BF.DeviceDesc="Kinect4Windows Camera" \ No newline at end of file diff --git a/Platform/Win32/Driver/x86/WdfCoInstaller01009.dll b/Platform/Win32/Driver/x86/WdfCoInstaller01009.dll deleted file mode 100644 index 30e81af..0000000 Binary files a/Platform/Win32/Driver/x86/WdfCoInstaller01009.dll and /dev/null differ diff --git a/Platform/Win32/Driver/x86/psdrv3.sys b/Platform/Win32/Driver/x86/psdrv3.sys deleted file mode 100644 index 6d00c6c..0000000 Binary files a/Platform/Win32/Driver/x86/psdrv3.sys and /dev/null differ diff --git a/README b/README index 6a8f27a..9cf774a 100644 --- a/README +++ b/README @@ -5,107 +5,7 @@ Kinect Mod: ----------- ***** Important notice: ***** -You must use this kinect mod version with the unstable OpenNI release which is available at: -http://www.openni.org/Downloads/OpenNIModules.aspx - -Changes: -v0.93: - 1) Added preliminary support for the Kinect4Windows sensor. - -v0.92: - 1) Updated codebase to the latest OpenNI / Sensor version (1.5.4.0 / 5.1.2.1) - -v0.91: - 1) Removed an unnecessary USB set interface command that caused timeout problems on Linux & Mac. - -v0.9: - 1) Updated codebase to the latest OpenNI / Sensor version (1.5.2.7 / 5.1.0.25) - 2) Changed the Bayer-to-RGB function to use the ROS (www.ros.org) code as requested by many community members. - (Thanks to Suat Gedikli from Willow Garage for writing the code and to Raphael Dumusc for the OpenNI adaptation!) - -v0.8: - 1) Updated codebase to the latest OpenNI / Sensor version (1.4.0.2 / 5.0.5.1) - -v0.7: - 1) Updated codebase to the latest OpenNI / Sensor version (1.3.2.3 / 5.0.3.34) - 2) Added a 64-bit binary installer for Windows. - -v0.6: - 1) Updated codebase to the latest OpenNI / Sensor version (1.3.2.1 / 5.0.3.33) - -v0.5: - 1) Updated codebase to the latest OpenNI / Sensor version (1.1.0.39 / 5.0.1.32) - 2) Changed to install directory from Sensor to SensorKinect to co-exist with the original PrimeSense Sensor module. - -v0.4: - 1) Merged code with the new unstable sensor driver from PrimeSense that adds MacOSX and multiple sensor support. - 2) Added precompiled binaries for Linux & MacOSX. - -v0.3: - 1) Added support for high-res 1280x1024 IR and Image (at ~10 FPS) - Checkout the file OPENNI\Data\SamplesConfig.xml for usage example. - (Copy it to your OpenNI\Data dir and use NiViewer to test the different resolutions) - -v0.2: - 1) VS2010 redist will now be installed automatically. - 2) The driver will now also be installed automatically on both x86 and x64 machines. - 3) Turned off the IR projector anti-cover thingy. It is off on the Xbox360 so it must be safe and it was very annoying... - -v0.1: - 1) Added the kinect USB VID/PID to the PSDrv3 driver and to the code. - 2) Changed the packet sequence field from 16-bit to 8-bit (don't know why it's different...) - 3) Changed the image format from YUV to 8-bit uncompressed bayer in the GlobalDefaults.ini file. - 4) Fixed the software depth-to-RGB registration. (Thanks ROS.org for that!) - -Install notes: - 1) Install unstable OpenNI (http://www.openni.org/Downloads/OpenNIModules.aspx) - On Linux/Mac please do: ./sudo install.sh - 2) Install Sensor (this version...) - On Linux/Mac please do: ./sudo install.sh - 3) Install unstable NITE (http://www.openni.org/Downloads/OpenNIModules.aspx) - On Linux/Mac please do: ./sudo install.sh - 4) Test #1: Run the NiViewer sample to make sure depth & image streams are working. - 5) Test #2: Run the OpenNI/NiUserTracker sample play with the skeleton. - 6) Test #3: Try the NITE/Sample-PointViewer sample for the hand tracking demo. - - For Mac/Linux, you will need to install the latest LibUSB. - Linux: - 1) Run: sudo apt-get install libusb-1.0-0-dev - 2) Run: sudo apt-get install freeglut3-dev - MaxOSX: - 1) Install MacPorts for OSX 10.6 from: https://distfiles.macports.org/MacPorts/MacPorts-1.9.2-10.6-SnowLeopard.dmg - for OSX 10.7 from: https://distfiles.macports.org/MacPorts/MacPorts-2.0.4-10.7-Lion.dmg - 2) Run: sudo port install libtool - 3) Run: sudo port install libusb-devel +universal - Note: Do not forget the +universal, it's very important!! - If you're previously already installed libusb-devel then use "sudo port uninstall libusb-devel" and reinstall it again with the +universal flag. -TIPs: - 1) If the driver is installed correctly you should see "Kinect Camera" and "Kinect Motor" under the "PrimeSensor" category in the device manager. - If not, try to install the driver manually by running the dp-inst files from the Driver directory. - -Todo: - 1) Add motor & led control. - 2) Add windows 8 support - it's not working at the moment due to manually modified INF files. - 3) Fix kinect4windows on Linux/MacOSX - it's very unstable. - -The source code for this version is available at: -https://github.com/avin2/SensorKinect - --------------------------- ORIGINAL README BELOW -------------------------- - -Website: http://www.primesense.com -Forum: http://groups.google.com/group/openni-dev -Wiki: http://wiki.openni.org - -Binaries are available at: -http://www.openni.org/Downloads/OpenNIModules.aspx -(The "OpenNI Compliant Hardware Binaries" section) - -Sources are available at: -https://github.com/PrimeSense/Sensor -or -https://github.com/PrimeSense/Sensor/tree/unstable -for the unstable branch +You must use this kinect mod version with the unstable OpenNI. Release Notes: -------------- @@ -119,44 +19,9 @@ Release Notes: - if the device was connected, unplug and reconnect it. This part is done automatically by the install script, but you will need to do it manually if you choose not to use the automated install. * Linux: The device driver contains a thread for reading from the USB device. This thread should have high priority in order to function correctly. Each process using the device driver should have the CAP_SYS_NICE capability in order to raise thread priority. Failing to have that capability, will cause a failure in setting priority, consequently causing loss of data. -* MacOSX: Only OSX 10.6 (Snow Leopard) and above with a 64-bit Intel based CPU is currently supported. - Client/Server is not supported yet so do not attempt to access the sensor with more then one application. - Build Notes: ------------ -Windows: - Requirements: - 1) Microsoft Visual Studio 2010 - From: http://msdn.microsoft.com/en-us/vstudio/bb984878.aspx - 2) Python 2.6+/3.x - From: http://www.python.org/download/ - 3) PyWin32 - From: http://sourceforge.net/projects/pywin32/files/pywin32/ - Please make sure you download the version that matches your exact python version. - 4) WIX 3.5 - From: http://wix.codeplex.com/releases/view/60102 - 5) OpenNI 1.5.x.x - From: http://www.openni.org/Downloads/OpenNIModules.aspx - - Optional Requirements (To build the documentation): - 1) Doxygen - From: http://www.stack.nl/~dimitri/doxygen/download.html#latestsrc - 2) GraphViz - From: http://www.graphviz.org/Download_windows.php - - Building Sensor: - 1) Go to the directory: "Platform\Win32\CreateRedist". - Run the script: "Redist.py". - This will compile and prepare the redist exe files that includes everything. - 2) Install the exe you've just made which is located in Platform\Win32\CreateRedist\FinalXX\Sensor-Win32-5.x.x.x.exe - (XX being the number of bits: 32 or 64) - The installer will also automatically register all the modules into OpenNI via the NiReg utility. - - The visual studio solution is located in: Platform\Win32\Build\EngineWin32.sln. - - Important: Please note that even though the directory is called Win32, you can also use it to compile it for 64-bit targets (AMD64/x64). - Linux: Requirements: 1) GCC 4.x @@ -211,44 +76,3 @@ Linux: Logs will be created in: STAGING/var/log/primesense To build the package manually, you can run "make PLATFORM=" in the "Platform\Linux\Build" directory. - If you wish to build the Mono wrappers, also run "make PLATFORM= mono_wrapper" and "make PLATFORM= mono_samples". - -MacOSX: - Requirements: - 1) For Mac OSX 10.7, Xcode 4.3.2 - From: http://developer.apple.com/devcenter/mac/index.action - http://adcdownload.apple.com/Developer_Tools/xcode_4.3.2/xcode_432_lion.dmg - - You will also need to download and install the "Commandline Tools for XCode - Late March 2012" package: - http://adcdownload.apple.com/Developer_Tools/command_line_tools_for_xcode_4.4__late_march_2012/cltools_lion_latemarch12.dmg - - Note: Since Xcode is now a normal application, it no longer automatically install itself. You have to copy&paste Xcode yourself into your Applications folder. - (or run the application "Install Xcode" from your Applications folder / LaunchPad). - It's also recommended to run the following command after you do the above: - sudo xcode-select -switch /Applications/Xcode.app/ - - For Mac OSX 10.6, Xcode 3.2.6: - From: http://developer.apple.com/devcenter/mac/index.action - http://developer.apple.com/devcenter/download.action?path=/Developer_Tools/xcode_3.2.6_and_ios_sdk_4.3__final/xcode_3.2.6_and_ios_sdk_4.3.dmg - - Please note that you need to register as a mac developer (It's free!). - - 2) OpenNI 1.5.x.x - From: http://www.openni.org/Downloads/OpenNIModules.aspx - - Building Sensor: - 1) Go into the directory: "Platform/Linux/CreateRedist". - Run the script: "./RedistMaker". - This will compile everything and create a redist package in the "Platform/Linux/Redist" directory. - It will also create a distribution in the "Platform/Linux/CreateRedist/Final" directory. - 2) Go into the directory: "Platform/Linux/Redist". - Run the script: "sudo ./install.sh" (needs to run as root) - - The install script copies key files to the following location: - Libs into: /usr/lib - Bins into: /usr/bin - Config files into: /usr/etc/primesense - USB rules into: /etc/udev/rules.d - Logs will be created in: /var/log/primesense - - To build the package manually, you can run "make" in the "Platform\Linux\Build" directory.