Skip to content

Commit 9f1eb13

Browse files
marcocantumarcocantu
authored
Merge pull request #7 from lmbelo/main
Script updates for 12 Athens
2 parents 873210d + 830a6da commit 9f1eb13

File tree

16 files changed

+58
-39
lines changed

16 files changed

+58
-39
lines changed

‎Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ COPY radserver_docker.sh radserver_docker.sh
2929
RUN ln -s /lib/x86_64-linux-gnu/libc.so.6 /lib/libc.so.6
3030

3131
#====GET ZIP FILES====
32-
ADD https://altd.embarcadero.com/getit/public/libraries/RADServer/RADServerInstallerLinux-20220912.zip ./radserver.zip
33-
ADD https://altd.embarcadero.com/releases/studio/22.0/113/LinuxPAServer22.0.tar.gz ./paserver.tar.gz
32+
ADD https://altd.embarcadero.com/getit/public/libraries/RADServer/RADServerLinux-20221103.zip ./radserver.zip
33+
ADD http://altd.embarcadero.com/releases/studio/23.0/120/LinuxPAServer23.0.tar.gz ./paserver.tar.gz
3434

3535
RUN unzip radserver.zip
3636
RUN tar xvzf paserver.tar.gz
@@ -52,7 +52,7 @@ RUN touch ./radserverlicense.slip
5252

5353
RUN sh ./radserver_install.sh -silent
5454

55-
RUN mv PAServer-22.0/* .
55+
RUN mv PAServer-23.0/* .
5656

5757
# link to installed libpython3.10
5858
RUN mv lldb/lib/libpython3.so lldb/lib/libpython3.so_
@@ -91,7 +91,7 @@ RUN rm RADServer.bin
9191
RUN rm radserverlicense.slip
9292
RUN rm radserver.zip
9393
RUN rm InterBase_2020_Linux.zip
94-
RUN rm PAServer-22.0 -r
94+
RUN rm PAServer-23.0 -r
9595
RUN rm paserver.tar.gz
9696
RUN rm radserver_install.sh
9797
RUN sed -e '/apachesetup.sh/ { d; }' /tmp/linux_cleanup.sh -i

‎LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
This software is Copyright © 2023 by [Embarcadero Technologies, Inc.](https://www.embarcadero.com/)
1+
This software is Copyright © 2024 by [Embarcadero Technologies, Inc.](https://www.embarcadero.com/)
22

33
_You may only use this software if you are an authorized licensee of an Embarcadero developer tools product. See the latest [software license agreement](https://www.embarcadero.com/products/rad-studio/rad-studio-eula) for any updates._
44

‎RADServerDockerDeploy/RADServerDockerDeploy.dpr

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ program RADServerDockerDeploy;
33
{$APPTYPE CONSOLE}
44

55
{$R *.res}
6-
7-
8-
96
{$R *.dres}
107

118
uses

‎RADServerDockerDeploy/RADServerDockerDeploy.dproj

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
<PropertyGroup>
33
<Base>True</Base>
44
<AppType>Console</AppType>
5-
<Config Condition="'$(Config)'==''">Debug</Config>
5+
<Config Condition="'$(Config)'==''">Release</Config>
66
<FrameworkType>None</FrameworkType>
77
<MainSource>RADServerDockerDeploy.dpr</MainSource>
88
<Platform Condition="'$(Platform)'==''">Linux64</Platform>
99
<ProjectGuid>{DB4DB272-3949-47C2-9855-B349DBADB3CA}</ProjectGuid>
10-
<ProjectVersion>19.5</ProjectVersion>
10+
<ProjectVersion>20.1</ProjectVersion>
1111
<TargetedPlatforms>131</TargetedPlatforms>
1212
</PropertyGroup>
1313
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
@@ -28,11 +28,23 @@
2828
<CfgParent>Base</CfgParent>
2929
<Base>true</Base>
3030
</PropertyGroup>
31+
<PropertyGroup Condition="('$(Platform)'=='Linux64' and '$(Cfg_1)'=='true') or '$(Cfg_1_Linux64)'!=''">
32+
<Cfg_1_Linux64>true</Cfg_1_Linux64>
33+
<CfgParent>Cfg_1</CfgParent>
34+
<Cfg_1>true</Cfg_1>
35+
<Base>true</Base>
36+
</PropertyGroup>
3137
<PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
3238
<Cfg_2>true</Cfg_2>
3339
<CfgParent>Base</CfgParent>
3440
<Base>true</Base>
3541
</PropertyGroup>
42+
<PropertyGroup Condition="('$(Platform)'=='Linux64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Linux64)'!=''">
43+
<Cfg_2_Linux64>true</Cfg_2_Linux64>
44+
<CfgParent>Cfg_2</CfgParent>
45+
<Cfg_2>true</Cfg_2>
46+
<Base>true</Base>
47+
</PropertyGroup>
3648
<PropertyGroup Condition="'$(Base)'!=''">
3749
<SanitizedProjectName>RADServerDockerDeploy</SanitizedProjectName>
3850
<DCC_ImageBase>00400000</DCC_ImageBase>
@@ -59,11 +71,21 @@
5971
<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
6072
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
6173
</PropertyGroup>
74+
<PropertyGroup Condition="'$(Cfg_1_Linux64)'!=''">
75+
<Debugger_Launcher>/usr/bin/gnome-terminal -- &quot;%debuggee%&quot;</Debugger_Launcher>
76+
<Manifest_File>(None)</Manifest_File>
77+
<AppDPIAwarenessMode>none</AppDPIAwarenessMode>
78+
</PropertyGroup>
6279
<PropertyGroup Condition="'$(Cfg_2)'!=''">
6380
<DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
6481
<DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
6582
<DCC_Optimize>false</DCC_Optimize>
6683
</PropertyGroup>
84+
<PropertyGroup Condition="'$(Cfg_2_Linux64)'!=''">
85+
<Debugger_Launcher>/usr/bin/gnome-terminal -- &quot;%debuggee%&quot;</Debugger_Launcher>
86+
<Manifest_File>(None)</Manifest_File>
87+
<AppDPIAwarenessMode>none</AppDPIAwarenessMode>
88+
</PropertyGroup>
6789
<ItemGroup>
6890
<DelphiCompile Include="$(MainSource)">
6991
<MainSource>MainSource</MainSource>

‎RADServerDockerDeploy/RADServerDockerModule.dpk

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,21 @@ package RADServerDockerModule;
99
{$EXTENDEDSYNTAX ON}
1010
{$IMPORTEDDATA ON}
1111
{$IOCHECKS ON}
12-
{$LOCALSYMBOLS ON}
12+
{$LOCALSYMBOLS OFF}
1313
{$LONGSTRINGS ON}
1414
{$OPENSTRINGS ON}
15-
{$OPTIMIZATION OFF}
16-
{$OVERFLOWCHECKS ON}
17-
{$RANGECHECKS ON}
18-
{$REFERENCEINFO ON}
15+
{$OPTIMIZATION ON}
16+
{$OVERFLOWCHECKS OFF}
17+
{$RANGECHECKS OFF}
18+
{$REFERENCEINFO OFF}
1919
{$SAFEDIVIDE OFF}
20-
{$STACKFRAMES ON}
20+
{$STACKFRAMES OFF}
2121
{$TYPEDADDRESS OFF}
2222
{$VARSTRINGCHECKS ON}
2323
{$WRITEABLECONST OFF}
2424
{$MINENUMSIZE 1}
2525
{$IMAGEBASE $400000}
26-
{$DEFINE DEBUG}
26+
{$DEFINE RELEASE}
2727
{$ENDIF IMPLICITBUILDING}
2828
{$RUNONLY}
2929
{$IMPLICITBUILD ON}

‎RADServerDockerDeploy/RADServerDockerModule.dproj

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
<PropertyGroup>
33
<Base>True</Base>
44
<AppType>Package</AppType>
5-
<Config Condition="'$(Config)'==''">Debug</Config>
5+
<Config Condition="'$(Config)'==''">Release</Config>
66
<FrameworkType>None</FrameworkType>
77
<MainSource>RADServerDockerModule.dpk</MainSource>
88
<Platform Condition="'$(Platform)'==''">Linux64</Platform>
99
<ProjectGuid>{E52EB6BF-D015-4A21-8E77-319F01378CDE}</ProjectGuid>
10-
<ProjectVersion>19.5</ProjectVersion>
10+
<ProjectVersion>20.1</ProjectVersion>
1111
<TargetedPlatforms>131</TargetedPlatforms>
1212
</PropertyGroup>
1313
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
@@ -50,14 +50,11 @@
5050
<CfgParent>Base</CfgParent>
5151
<Base>true</Base>
5252
</PropertyGroup>
53-
<PropertyGroup Condition="'$(Base_OSXARM64)'!=''">
54-
<BT_BuildType>Debug</BT_BuildType>
55-
<VerInfo_Keys>CFBundleName=$(MSBuildProjectName);CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleVersion=1.0.0;CFBundleShortVersionString=1.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);NSHighResolutionCapable=true;LSApplicationCategoryType=public.app-category.utilities;NSLocationUsageDescription=The reason for accessing the location information of the user;NSContactsUsageDescription=The reason for accessing the contacts;NSCalendarsUsageDescription=The reason for accessing the calendar data;NSRemindersUsageDescription=The reason for accessing the reminders;NSCameraUsageDescription=The reason for accessing the camera;NSMicrophoneUsageDescription=The reason for accessing the microphone;NSMotionUsageDescription=The reason for accessing the accelerometer;NSDesktopFolderUsageDescription=The reason for accessing the Desktop folder;NSDocumentsFolderUsageDescription=The reason for accessing the Documents folder;NSDownloadsFolderUsageDescription=The reason for accessing the Downloads folder;NSNetworkVolumesUsageDescription=The reason for accessing files on a network volume;NSRemovableVolumesUsageDescription=The reason for accessing files on a removable volume;NSSpeechRecognitionUsageDescription=The reason for requesting to send user data to Apple&apos;s speech recognition servers;ITSAppUsesNonExemptEncryption=false</VerInfo_Keys>
56-
</PropertyGroup>
57-
<PropertyGroup Condition="'$(Base_iOSSimARM64)'!=''">
58-
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
59-
<VerInfo_Keys>CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0;CFBundleShortVersionString=1.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone &amp; iPad;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;NSLocationAlwaysAndWhenInUseUsageDescription=The reason for accessing the location information of the user;UIBackgroundModes=;NSContactsUsageDescription=The reason for accessing the contacts;NSPhotoLibraryUsageDescription=The reason for accessing the photo library;NSPhotoLibraryAddUsageDescription=The reason for adding to the photo library;NSCameraUsageDescription=The reason for accessing the camera;NSFaceIDUsageDescription=The reason for accessing the face id;NSMicrophoneUsageDescription=The reason for accessing the microphone;NSSiriUsageDescription=The reason for accessing Siri;ITSAppUsesNonExemptEncryption=false;NSBluetoothAlwaysUsageDescription=The reason for accessing bluetooth;NSBluetoothPeripheralUsageDescription=The reason for accessing bluetooth peripherals;NSCalendarsUsageDescription=The reason for accessing the calendar data;NSRemindersUsageDescription=The reason for accessing the reminders;NSMotionUsageDescription=The reason for accessing the accelerometer;NSSpeechRecognitionUsageDescription=The reason for requesting to send user data to Apple&apos;s speech recognition servers</VerInfo_Keys>
60-
<VerInfo_UIDeviceFamily>iPhoneAndiPad</VerInfo_UIDeviceFamily>
53+
<PropertyGroup Condition="('$(Platform)'=='Linux64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Linux64)'!=''">
54+
<Cfg_2_Linux64>true</Cfg_2_Linux64>
55+
<CfgParent>Cfg_2</CfgParent>
56+
<Cfg_2>true</Cfg_2>
57+
<Base>true</Base>
6158
</PropertyGroup>
6259
<PropertyGroup Condition="'$(Base)'!=''">
6360
<SanitizedProjectName>RADServerDockerModule</SanitizedProjectName>
@@ -114,6 +111,9 @@
114111
<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
115112
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
116113
</PropertyGroup>
114+
<PropertyGroup Condition="'$(Cfg_2_Linux64)'!=''">
115+
<Debugger_Launcher>/usr/bin/gnome-terminal -- &quot;%debuggee%&quot;</Debugger_Launcher>
116+
</PropertyGroup>
117117
<ItemGroup>
118118
<DelphiCompile Include="$(MainSource)">
119119
<MainSource>MainSource</MainSource>

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Example:
6161
```
6262
---
6363

64-
This software is Copyright &copy; 2023 by [Embarcadero Technologies, Inc.](https://www.embarcadero.com/)
64+
This software is Copyright &copy; 2024 by [Embarcadero Technologies, Inc.](https://www.embarcadero.com/)
6565

6666
_You may only use this software if you are an authorized licensee of an Embarcadero developer tools product. See the latest [software license agreement](https://www.embarcadero.com/products/rad-studio/rad-studio-eula) for any updates._
6767

‎SmokeTests/Test-PAServer.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Set-Location $PSScriptRoot
22

33
# find out RAD Studio directory
4-
$BDSVersion = "22.0"
4+
$BDSVersion = "23.0"
55
$BDSDirectory = (Get-ItemProperty `
66
-Path "registry::HKEY_CURRENT_USER\SOFTWARE\Embarcadero\BDS\$BDSVersion" `
77
-Name RootDir).RootDir

‎Solutions/Custom-RAD-Server-Module/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM radstudio/pa-radserver-ib
1+
FROM radstudio/pa-radserver-ib:latest
22

33
ARG password=embtdocker
44
ARG modulefile

‎Solutions/Custom-RAD-Server-Module/build-run-production.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
if [ "$1" == '' ]; then
3+
if [ "$1" = '' ]; then
44
echo "RAD Server Docker pa-radserver-ib-custom-module Build-Run Script";
55
echo "Place RAD Server endpoint custom resource module in this directory and pass it as the first argument";
66
echo "Required argument: module filename";

0 commit comments

Comments
 (0)