Merge pull request #1 from Fluigent/unique_version

Provide a unique version
Fluigent · Sep 4, 2023 · 738dd2b · 738dd2b
2 parents ae77537 + c4f1644
commit 738dd2b
Show file tree

Hide file tree

Showing 37 changed files with 31 additions and 33 deletions.
diff --git a/Aria_SDK.pdf b/Aria_SDK.pdf
diff --git a/README.md b/README.md
@@ -38,3 +38,7 @@ Here are the package contents:
 | C++          | **main.cpp** example script <br> **aria_sdk_example_cpp.sln** Visual Studio complete solution containing middleware and examples |
 | C#           | **Program.cs** example script <br> **aria-sdk-example.sln** Visual Studio complete solution containing middleware and examples |
 | Python       | **aria-sdk-example.py** example script |
+
+## Support
+
+For any question, please contact [email protected] 
diff --git a/cpp/README.md b/cpp/README.md
@@ -3,6 +3,6 @@
 This is a console application written in C++ 14, demonstrating the basic usage of the Fluigent Aria SDK.
 
 ## Instructions
-- Copy the shared folder (containing the SDK DLLs and headers) to the root folder of the example (the folder which contains this README file)
-- Open the aria_sdk_example_cpp.sln solution file with Visual Studio
-- Build and run the aria_sdk_example_cpp project
+- Make sure there is a `dll/` folder containing the SDK DLLs (`win/[x86|x64]/[*.dll|*.lib]`) and headers (`Headers/*.h`) in the root folder of the example
+- Open the `aria_sdk_example_cpp.sln` solution file with Visual Studio
+- Build and run the `aria_sdk_example_cpp` project
diff --git a/cpp/aria_sdk_example_cpp.vcxproj b/cpp/aria_sdk_example_cpp.vcxproj
@@ -76,16 +76,16 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(MSBuildProjectDirectory)\shared\Headers\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(MSBuildProjectDirectory)\dll\Headers\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>$(CoreLibraryDependencies);%(AdditionalDependencies);$(MSBuildProjectDirectory)\shared\win\x86\aria_sdk_clr.lib</AdditionalDependencies>
+      <AdditionalDependencies>$(CoreLibraryDependencies);%(AdditionalDependencies);$(MSBuildProjectDirectory)\dll\win\x86\aria_sdk_clr.lib</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
-      <Command>copy "$(ProjectDir)\shared\win\x86\aria_sdk.dll" "$(OutDir)aria_sdk.dll"
-copy "$(ProjectDir)\shared\win\x86\aria_sdk_clr.dll" "$(OutDir)aria_sdk_clr.dll"</Command>
+      <Command>copy "$(ProjectDir)\dll\win\x86\aria_sdk.dll" "$(OutDir)aria_sdk.dll"
+copy "$(ProjectDir)\dll\win\x86\aria_sdk_clr.dll" "$(OutDir)aria_sdk_clr.dll"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -116,16 +116,16 @@ copy $(ProjectDir)aria_sdk_clr.dll $(OutDir)aria_sdk_clr.dll</Command>
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(MSBuildProjectDirectory)\shared\Headers\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(MSBuildProjectDirectory)\dll\Headers\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>$(CoreLibraryDependencies);%(AdditionalDependencies);$(MSBuildProjectDirectory)\shared\win\x64\aria_sdk_clr.lib</AdditionalDependencies>
+      <AdditionalDependencies>$(CoreLibraryDependencies);%(AdditionalDependencies);$(MSBuildProjectDirectory)\dll\win\x64\aria_sdk_clr.lib</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
-      <Command>copy "$(ProjectDir)\shared\win\x64\aria_sdk.dll" "$(OutDir)aria_sdk.dll"
-copy "$(ProjectDir)\shared\win\x64\aria_sdk_clr.dll" "$(OutDir)aria_sdk_clr.dll"</Command>
+      <Command>copy "$(ProjectDir)\dll\win\x64\aria_sdk.dll" "$(OutDir)aria_sdk.dll"
+copy "$(ProjectDir)\dll\win\x64\aria_sdk_clr.dll" "$(OutDir)aria_sdk_clr.dll"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

diff --git a/cpp/Headers/AriaIO.h → cpp/dll/Headers/AriaIO.h b/cpp/Headers/AriaIO.h → cpp/dll/Headers/AriaIO.h
diff --git a/cpp/Headers/AriaSDK.h → cpp/dll/Headers/AriaSDK.h b/cpp/Headers/AriaSDK.h → cpp/dll/Headers/AriaSDK.h
diff --git a/cpp/Headers/Configuration.h → cpp/dll/Headers/Configuration.h b/cpp/Headers/Configuration.h → cpp/dll/Headers/Configuration.h
diff --git a/cpp/Headers/Enums.h → cpp/dll/Headers/Enums.h b/cpp/Headers/Enums.h → cpp/dll/Headers/Enums.h
diff --git a/cpp/Headers/Error.h → cpp/dll/Headers/Error.h b/cpp/Headers/Error.h → cpp/dll/Headers/Error.h
diff --git a/cpp/Headers/FlowControl.h → cpp/dll/Headers/FlowControl.h b/cpp/Headers/FlowControl.h → cpp/dll/Headers/FlowControl.h
diff --git a/cpp/Headers/Instrument.h → cpp/dll/Headers/Instrument.h b/cpp/Headers/Instrument.h → cpp/dll/Headers/Instrument.h
diff --git a/cpp/Headers/Monitoring.h → cpp/dll/Headers/Monitoring.h b/cpp/Headers/Monitoring.h → cpp/dll/Headers/Monitoring.h
diff --git a/cpp/Headers/Procedures.h → cpp/dll/Headers/Procedures.h b/cpp/Headers/Procedures.h → cpp/dll/Headers/Procedures.h
diff --git a/cpp/Headers/Sequence.h → cpp/dll/Headers/Sequence.h b/cpp/Headers/Sequence.h → cpp/dll/Headers/Sequence.h
diff --git a/cpp/Headers/Step.h → cpp/dll/Headers/Step.h b/cpp/Headers/Step.h → cpp/dll/Headers/Step.h
diff --git a/cpp/Headers/StepList.h → cpp/dll/Headers/StepList.h b/cpp/Headers/StepList.h → cpp/dll/Headers/StepList.h
diff --git a/cpp/Headers/Switches.h → cpp/dll/Headers/Switches.h b/cpp/Headers/Switches.h → cpp/dll/Headers/Switches.h
diff --git a/cpp/dll/win/x64/aria_sdk_Msw.dll → cpp/dll/win/x64/aria_sdk.dll b/cpp/dll/win/x64/aria_sdk_Msw.dll → cpp/dll/win/x64/aria_sdk.dll
diff --git a/cpp/dll/win/x64/aria_sdk_clr_2sw.dll → cpp/dll/win/x64/aria_sdk_clr.dll b/cpp/dll/win/x64/aria_sdk_clr_2sw.dll → cpp/dll/win/x64/aria_sdk_clr.dll
diff --git a/cpp/dll/win/x64/aria_sdk_clr_2sw.lib → cpp/dll/win/x64/aria_sdk_clr.lib b/cpp/dll/win/x64/aria_sdk_clr_2sw.lib → cpp/dll/win/x64/aria_sdk_clr.lib
diff --git a/cpp/dll/win/x64/aria_sdk_clr_Msw.dll b/cpp/dll/win/x64/aria_sdk_clr_Msw.dll
diff --git a/cpp/dll/win/x64/aria_sdk_clr_Msw.lib b/cpp/dll/win/x64/aria_sdk_clr_Msw.lib
diff --git a/cpp/dll/win/x86/aria_sdk_Msw.dll → cpp/dll/win/x86/aria_sdk.dll b/cpp/dll/win/x86/aria_sdk_Msw.dll → cpp/dll/win/x86/aria_sdk.dll
diff --git a/cpp/dll/win/x86/aria_sdk_clr_2sw.dll → cpp/dll/win/x86/aria_sdk_clr.dll b/cpp/dll/win/x86/aria_sdk_clr_2sw.dll → cpp/dll/win/x86/aria_sdk_clr.dll
diff --git a/cpp/dll/win/x86/aria_sdk_clr_2sw.lib → cpp/dll/win/x86/aria_sdk_clr.lib b/cpp/dll/win/x86/aria_sdk_clr_2sw.lib → cpp/dll/win/x86/aria_sdk_clr.lib
diff --git a/cpp/dll/win/x86/aria_sdk_clr_Msw.dll b/cpp/dll/win/x86/aria_sdk_clr_Msw.dll
diff --git a/cpp/dll/win/x86/aria_sdk_clr_Msw.lib b/cpp/dll/win/x86/aria_sdk_clr_Msw.lib
diff --git a/csharp/README.md b/csharp/README.md
@@ -3,5 +3,5 @@
 This is a console application written in C# for .NET Framework 4.8, demonstrating the basic usage of the Fluigent Aria SDK.
 
 ## Instructions
-- Copy the aria-sdk.dll file to the example folder
-- Build and run the aria-sdk-example project.
+- Copy the aria-sdk.dll file for your target architecture to the root folder
+- Build and run the `aria-sdk-example` project.
diff --git a/csharp/dll/win/x64/aria_sdk_Msw.dll → csharp/dll/win/x64/aria_sdk.dll b/csharp/dll/win/x64/aria_sdk_Msw.dll → csharp/dll/win/x64/aria_sdk.dll
diff --git a/csharp/dll/win/x64/aria_sdk_2sw.dll b/csharp/dll/win/x64/aria_sdk_2sw.dll
diff --git a/csharp/dll/win/x86/aria_sdk_Msw.dll → csharp/dll/win/x86/aria_sdk.dll b/csharp/dll/win/x86/aria_sdk_Msw.dll → csharp/dll/win/x86/aria_sdk.dll
diff --git a/csharp/dll/win/x86/aria_sdk_2sw.dll b/csharp/dll/win/x86/aria_sdk_2sw.dll
diff --git a/python/.gitignore b/python/.gitignore
@@ -1,4 +1,3 @@
-*.dll
 *egg-info/
 dist/
 __pycache__/
diff --git a/python/README.md b/python/README.md
@@ -3,11 +3,11 @@
 This groups a package structure that allows for a quick installation with `pip` and a basic example script written in Python (3+), demonstrating the basic usage of the Fluigent Aria SDK.
 
 ## Setup and test
-- Place the SDK DLLs in a folder called `dlls/` in the repository root, with the paths `win/x86/*.dll` and `win/x64/*.dll`
+- Place the SDK DLLs in a folder called `dlls/` in the repository root, with the paths `win/x86/aria_sdk.dll` and `win/x64/aria_sdk.dll`
 - Go to the package directory: `cd package/`
 - Run `python deploy.py`
-- Install the SDK with `pip install dist/2sw/aria_sdk-1.2.0.zip` or `pip install dist/Msw/aria_sdk-1.2.0.zip`
+- Install the SDK with `pip install dist/aria_sdk-X.X.X.zip`
 - Then test with the example script: `cd ../ && python example/aria-sdk-example.py`
 
 ## Distribution
-- Once generated, copy `package/dist/2sw/aria_sdk-1.2.0.zip` and/or `package/dist/Msw/aria_sdk-1.2.0.zip` file and the `example/` folder to the release archive.
+- Once generated, copy `package/dist/aria_sdk-X.X.X.zip` file and the `example/` folder to the release archive.
diff --git a/cpp/dll/win/x64/aria_sdk_2sw.dll → python/dll/win/x64/aria_sdk.dll b/cpp/dll/win/x64/aria_sdk_2sw.dll → python/dll/win/x64/aria_sdk.dll
diff --git a/cpp/dll/win/x86/aria_sdk_2sw.dll → python/dll/win/x86/aria_sdk.dll b/cpp/dll/win/x86/aria_sdk_2sw.dll → python/dll/win/x86/aria_sdk.dll
diff --git a/python/package/deploy.py b/python/package/deploy.py
@@ -7,21 +7,16 @@
 from distutils.core import run_setup
 
 version = "1.2.0"
-packages = ["2sw", "Msw"]
 
-for suffix in packages:
-    dist_suffix = os.path.join("dist", suffix)
-    try:
-        shutil.rmtree(os.path.join("Aria", "SDK", "shared"))
-    except:
-        pass
-    dll_src_name = f"aria_sdk_{suffix}.dll"
-    dll_dst_name= "aria_sdk.dll"
-    for arch in ["x86", "x64"]:
-        os.makedirs(os.path.join("Aria", "SDK", "shared", "windows", arch))
-        shutil.copy(os.path.join("..", "dlls", "win", arch, dll_src_name), os.path.join("Aria", "SDK", "shared", "windows", arch, dll_dst_name))
-        run_setup("setup.py", ["sdist","--format=zip"])
-        os.makedirs(os.path.join(dist_suffix), exist_ok = True)
-        shutil.copy(os.path.join("dist", f"aria_sdk-{version}.zip"), dist_suffix)
-        os.remove(os.path.join("dist", f"aria_sdk-{version}.zip"))
+try:
+    shutil.rmtree(os.path.join("Aria", "SDK", "shared"))
+except:
+    pass
+dll_dst_name= "aria_sdk.dll"
+
+for arch in ["x86", "x64"]:
+    os.makedirs(os.path.join("Aria", "SDK", "shared", "windows", arch))
+    shutil.copy(os.path.join("..", "dll", "win", arch, dll_dst_name), os.path.join("Aria", "SDK", "shared", "windows", arch, dll_dst_name))
+
+run_setup("setup.py", ["sdist","--format=zip"])