From 7259e33da7c1a997d218e1b158bb44407e344fc0 Mon Sep 17 00:00:00 2001 From: Jonah Friedman Date: Thu, 19 Jul 2018 11:23:41 -0400 Subject: [PATCH] Cleaned out some AlShaders stuff, restored INSTALL and README --- CMakeLists.txt | 12 ++++++------ INSTALL | 1 + README | 1 + package.in.py | 16 ++++++++-------- 4 files changed, 16 insertions(+), 14 deletions(-) create mode 100644 INSTALL create mode 100644 README diff --git a/CMakeLists.txt b/CMakeLists.txt index 568af01..a13a94e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,10 +4,10 @@ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) project(alShaders2) -set(ALS_MAJOR_VERSION 2) -set(ALS_MINOR_VERSION 0) -set(ALS_PATCH_VERSION 0b4) -set(ALS_VERSION "${ALS_MAJOR_VERSION}.${ALS_MINOR_VERSION}.${ALS_PATCH_VERSION}") +set(CM_MAJOR_VERSION 1) +set(CM_MINOR_VERSION 0) +set(CM_PATCH_VERSION 0) +set(CM_VERSION "${CM_MAJOR_VERSION}.${CM_MINOR_VERSION}.${CM_PATCH_VERSION}") set(CMAKE_VERBOSE_MAKEFILE FALSE) set(CMAKE_SKIP_RPATH TRUE) @@ -45,10 +45,10 @@ link_directories(${ARNOLD_LIBRARY_DIR}) if (NOT DEFINED INSTALL_DIR) if (DEFINED INSTALL_ROOT) - set(INSTALL_DIR "${INSTALL_ROOT}/${ALS_VERSION}/ai${ARNOLD_VERSION}") + set(INSTALL_DIR "${INSTALL_ROOT}/${CM_VERSION}/ai${ARNOLD_VERSION}") message("INSTALL_ROOT defined. Adding versions automatically:\n\t${INSTALL_DIR}") else() - set(INSTALL_DIR "${CMAKE_BINARY_DIR}/dist/${ALS_VERSION}/ai${ARNOLD_VERSION}") + set(INSTALL_DIR "${CMAKE_BINARY_DIR}/dist/${CM_VERSION}/ai${ARNOLD_VERSION}") message("INSTALL_DIR not defined. Defaulting to:\n\t${INSTALL_DIR}") endif() else() diff --git a/INSTALL b/INSTALL new file mode 100644 index 0000000..3b94f91 --- /dev/null +++ b/INSTALL @@ -0,0 +1 @@ +Placeholder diff --git a/README b/README new file mode 100644 index 0000000..3b94f91 --- /dev/null +++ b/README @@ -0,0 +1 @@ +Placeholder diff --git a/package.in.py b/package.in.py index 09f3582..aeae0db 100755 --- a/package.in.py +++ b/package.in.py @@ -17,10 +17,10 @@ def mkdir_p(path): pass else: raise -MAJOR_VERSION = '@ALS_MAJOR_VERSION@' -MINOR_VERSION = '@ALS_MINOR_VERSION@' -PATCH_VERSION = '@ALS_PATCH_VERSION@' -ALS_VERSION = "%s.%s.%s" % (MAJOR_VERSION, MINOR_VERSION, PATCH_VERSION) +MAJOR_VERSION = '@CM_MAJOR_VERSION@' +MINOR_VERSION = '@CM_MINOR_VERSION@' +PATCH_VERSION = '@CM_PATCH_VERSION@' +CM_VERSION = "%s.%s.%s" % (MAJOR_VERSION, MINOR_VERSION, PATCH_VERSION) ARNOLD_VERSION = '@ARNOLD_VERSION@' subdirs = [ @@ -54,9 +54,9 @@ def mkdir_p(path): # Binary distribution files_src = ['INSTALL', 'CMakeLists.txt', 'package.in.py', 'README', 'uigen.py'] -name_osx = 'alShaders-osx-%s-ai%s' % (ALS_VERSION, ARNOLD_VERSION) -name_win = 'alShaders-win-%s-ai%s' % (ALS_VERSION, ARNOLD_VERSION) -name_linux = 'alShaders-linux-%s-ai%s' % (ALS_VERSION, ARNOLD_VERSION) +name_osx = 'alShaders-osx-%s-ai%s' % (CM_VERSION, ARNOLD_VERSION) +name_win = 'alShaders-win-%s-ai%s' % (CM_VERSION, ARNOLD_VERSION) +name_linux = 'alShaders-linux-%s-ai%s' % (CM_VERSION, ARNOLD_VERSION) def copyPatternsToDistDir(subDirs, subDirPrefix, filePatterns, distDir): @@ -109,7 +109,7 @@ def createBinaryDistribution(name, droot): createSourceDistribution(name_src, ptrn_src, files_src) # Binary distribution -droot = 'build/dist/%s/ai%s' % (ALS_VERSION, ARNOLD_VERSION) +droot = 'build/dist/%s/ai%s' % (CM_VERSION, ARNOLD_VERSION) if platform.system() == "Darwin": # OS X distribution