From 55eab7196d0104c71e40136b3b22e9501d234e17 Mon Sep 17 00:00:00 2001
From: Vasilii Chernov <vchernov@inr.ru>
Date: Fri, 12 Feb 2016 14:43:20 +0100
Subject: 1. Cmakelists - move copy xml folder command to root file 2. - Move
 set python paths code to python module init funtction      - pci.c move
 python module init block code after checking model        to get paths before
 it runs.    - Fix set python path code to work with PYTHONPATH    - Update
 pci run script to work with PYTHONPATH    - Fix python finalize code 3.
 Change pcilib_script_s interacting method. Now it stores in hash. 4. Change
 names of some fucntions to more unified ones 5. Remove old unused function
 pcilib_xml_create_script_or_transform_view 6. cli - disable reading register
 after set if write_verification flag is off 7. Remove uninformative error
 messages fro Python wrap. 8. - Server.py - add read/write property/register
 command handling    - Add help message    - Correcting paths

---
 xml/CMakeLists.txt            | 27 ---------------------------
 xml/test_pywrap/test_prop2.py |  2 +-
 2 files changed, 1 insertion(+), 28 deletions(-)

(limited to 'xml')

diff --git a/xml/CMakeLists.txt b/xml/CMakeLists.txt
index 0b12d87..a7ac800 100644
--- a/xml/CMakeLists.txt
+++ b/xml/CMakeLists.txt
@@ -1,30 +1,3 @@
 install(FILES model.xsd references.xsd types.xsd
     DESTINATION ${PCILIB_MODEL_DIR}
 )
-
-# Copy files from source directory to destination directory, substituting any
-# variables.  Create destination directory if it does not exist.
-
-macro(configure_files srcDir destDir)
-    message(STATUS "Configuring directory ${destDir}")
-    make_directory(${destDir})
-
-    file(GLOB templateFiles RELATIVE ${srcDir} ${srcDir}/*)
-    foreach(templateFile ${templateFiles})
-        set(srcTemplatePath ${srcDir}/${templateFile})
-        if(NOT IS_DIRECTORY ${srcTemplatePath})
-            message(STATUS "Configuring file ${templateFile}")
-            configure_file(
-                    ${srcTemplatePath}
-                    ${destDir}/${templateFile}
-                    @ONLY)
-        endif(NOT IS_DIRECTORY ${srcTemplatePath})
-    endforeach(templateFile)
-endmacro(configure_files)
-
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/model.xsd ${CMAKE_CURRENT_BINARY_DIR}/model.xsd)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/references.xsd ${CMAKE_CURRENT_BINARY_DIR}/references.xsd)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/types.xsd ${CMAKE_CURRENT_BINARY_DIR}/types.xsd)
-
-configure_files(${CMAKE_CURRENT_SOURCE_DIR}/test ${CMAKE_CURRENT_BINARY_DIR}/test)
-configure_files(${CMAKE_CURRENT_SOURCE_DIR}/test_pywrap ${CMAKE_CURRENT_BINARY_DIR}/test_pywrap)
diff --git a/xml/test_pywrap/test_prop2.py b/xml/test_pywrap/test_prop2.py
index a831fdd..69a2190 100644
--- a/xml/test_pywrap/test_prop2.py
+++ b/xml/test_pywrap/test_prop2.py
@@ -4,5 +4,5 @@ def read_from_register():
     return pcipywrap.get_property('/registers/fpga/reg1') / 2
     
 def write_to_register(value):    
-    pcipywrap.set_property('/registers/fpga/reg1', value*3)
+    pcipywrap.set_property(value*3, '/registers/fpga/reg1')
 
-- 
cgit v1.2.3