Skip to content

Commit 7195dca

Browse files
openeuler-ci-botgitee-org
openeuler-ci-bot
authored and
gitee-org
committed
!36 support 24.09
From: @wenl4ng Reviewed-by: @mywaaagh_admin Signed-off-by: @mywaaagh_admin
2 parents 9485b98 + f7d91e4 commit 7195dca

File tree

7 files changed

+256
-2
lines changed

7 files changed

+256
-2
lines changed

‎jenkins/app/jenkinsfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ pipeline {
1313
properties([
1414
giteeConnection('gitee'),
1515
parameters([
16-
choice(choices: ['22.03', '20.03', '23.03', '23.09', '24.03'], description: 'openEuler release version', name: 'release'),
16+
choice(choices: ['22.03', '20.03', '23.03', '23.09', '24.03', '24.09'], description: 'openEuler release version', name: 'release'),
1717
choice(choices: ['no', 'yes'], description:'Whether to publish the app to Windows Store', name: 'publish'),
1818
string(name: 'server', description:'hostname of daily build server', defaultValue: 'http://121.36.84.172'),
1919
string(name: 'baseuri', description:'base uri of daily build repos', defaultValue: 'dailybuild'),

‎meta/23.09/DistroLauncher-Appx/MyDistro.appxmanifest

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<Resource Language="x-generate" />
1818
</Resources>
1919
<Applications>
20-
<Application Id="openEuler2303" Executable="openEuler23.09.exe" EntryPoint="Windows.FullTrustApplication">
20+
<Application Id="openEuler2309" Executable="openEuler23.09.exe" EntryPoint="Windows.FullTrustApplication">
2121
<uap:VisualElements DisplayName="openEuler 23.09" Description="openEuler 23.09" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" BackgroundColor="transparent">
2222
<uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png" Square310x310Logo="Assets\LargeTile.png" Square71x71Logo="Assets\SmallTile.png">
2323
</uap:DefaultTile>

‎meta/24.09/24.09.PNG

44.6 KB
Loading

‎meta/24.09/DistroLauncher-Appx/DistroLauncher-Appx.vcxproj

+183
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,183 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup Label="Globals">
4+
<ProjectGuid>{f63472f9-d0a0-412e-aa3d-a4e822970486}</ProjectGuid>
5+
<RootNamespace>DistroLauncher_Appx</RootNamespace>
6+
<DefaultLanguage>en-US</DefaultLanguage>
7+
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
8+
<AppContainerApplication>true</AppContainerApplication>
9+
<ApplicationType>Windows Store</ApplicationType>
10+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
11+
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
12+
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
13+
<TargetName>openEuler24.09</TargetName>
14+
<ProjectName>DistroLauncher-Appx</ProjectName>
15+
</PropertyGroup>
16+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
17+
<ItemGroup Label="ProjectConfigurations">
18+
<ProjectConfiguration Include="Debug|ARM64">
19+
<Configuration>Debug</Configuration>
20+
<Platform>ARM64</Platform>
21+
</ProjectConfiguration>
22+
<ProjectConfiguration Include="Debug|x64">
23+
<Configuration>Debug</Configuration>
24+
<Platform>x64</Platform>
25+
</ProjectConfiguration>
26+
<ProjectConfiguration Include="Release|ARM64">
27+
<Configuration>Release</Configuration>
28+
<Platform>ARM64</Platform>
29+
</ProjectConfiguration>
30+
<ProjectConfiguration Include="Release|x64">
31+
<Configuration>Release</Configuration>
32+
<Platform>x64</Platform>
33+
</ProjectConfiguration>
34+
</ItemGroup>
35+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
36+
<ConfigurationType>Application</ConfigurationType>
37+
<UseDebugLibraries>true</UseDebugLibraries>
38+
<PlatformToolset>v143</PlatformToolset>
39+
</PropertyGroup>
40+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
41+
<ConfigurationType>Application</ConfigurationType>
42+
<UseDebugLibraries>true</UseDebugLibraries>
43+
<PlatformToolset>v143</PlatformToolset>
44+
<WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
45+
</PropertyGroup>
46+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
47+
<ConfigurationType>Application</ConfigurationType>
48+
<UseDebugLibraries>false</UseDebugLibraries>
49+
<WholeProgramOptimization>true</WholeProgramOptimization>
50+
<PlatformToolset>v143</PlatformToolset>
51+
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
52+
</PropertyGroup>
53+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
54+
<ConfigurationType>Application</ConfigurationType>
55+
<UseDebugLibraries>false</UseDebugLibraries>
56+
<WholeProgramOptimization>true</WholeProgramOptimization>
57+
<PlatformToolset>v143</PlatformToolset>
58+
<WindowsSDKDesktopARM64Support>true</WindowsSDKDesktopARM64Support>
59+
</PropertyGroup>
60+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
61+
<ImportGroup Label="ExtensionSettings">
62+
</ImportGroup>
63+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
64+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
65+
</ImportGroup>
66+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
67+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
68+
</ImportGroup>
69+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
70+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
71+
</ImportGroup>
72+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
73+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
74+
</ImportGroup>
75+
<PropertyGroup Label="UserMacros" />
76+
<PropertyGroup>
77+
<AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
78+
<AppxBundle>Always</AppxBundle>
79+
<PackageCertificateThumbprint>EADCB9D547A9BC1A2937F025F98D755EDD8DCCE5</PackageCertificateThumbprint>
80+
<GenerateAppInstallerFile>False</GenerateAppInstallerFile>
81+
<AppxBundlePlatforms>x64|arm64</AppxBundlePlatforms>
82+
<AppInstallerUpdateFrequency>0</AppInstallerUpdateFrequency>
83+
<AppInstallerCheckForUpdateFrequency>OnApplicationRun</AppInstallerCheckForUpdateFrequency>
84+
<AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
85+
<AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
86+
<GenerateTestArtifacts>True</GenerateTestArtifacts>
87+
<HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
88+
</PropertyGroup>
89+
<ItemDefinitionGroup>
90+
<Link>
91+
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
92+
<WindowsMetadataFile />
93+
</Link>
94+
</ItemDefinitionGroup>
95+
<ItemGroup>
96+
<AppxManifest Include="MyDistro.appxmanifest">
97+
<SubType>Designer</SubType>
98+
</AppxManifest>
99+
<None Include="DistroLauncher-Appx_StoreKey.pfx" />
100+
<None Include="DistroLauncher-Appx_TemporaryKey.pfx" />
101+
</ItemGroup>
102+
<ItemGroup Condition="'$(Platform)'=='x64'">
103+
<None Include="..\x64\install.tar.gz">
104+
<DeploymentContent>true</DeploymentContent>
105+
</None>
106+
</ItemGroup>
107+
<ItemGroup Condition="'$(Platform)'=='ARM64'">
108+
<None Include="..\ARM64\install.tar.gz">
109+
<DeploymentContent>true</DeploymentContent>
110+
</None>
111+
</ItemGroup>
112+
<ItemGroup>
113+
<Image Include="Assets\LargeTile.scale-100.png" />
114+
<Image Include="Assets\LargeTile.scale-125.png" />
115+
<Image Include="Assets\LargeTile.scale-150.png" />
116+
<Image Include="Assets\LargeTile.scale-200.png" />
117+
<Image Include="Assets\LargeTile.scale-400.png" />
118+
<Image Include="Assets\SmallTile.scale-100.png" />
119+
<Image Include="Assets\SmallTile.scale-125.png" />
120+
<Image Include="Assets\SmallTile.scale-150.png" />
121+
<Image Include="Assets\SmallTile.scale-200.png" />
122+
<Image Include="Assets\SmallTile.scale-400.png" />
123+
<Image Include="Assets\SplashScreen.scale-100.png" />
124+
<Image Include="Assets\SplashScreen.scale-125.png" />
125+
<Image Include="Assets\SplashScreen.scale-150.png" />
126+
<Image Include="Assets\SplashScreen.scale-200.png" />
127+
<Image Include="Assets\SplashScreen.scale-400.png" />
128+
<Image Include="Assets\Square150x150Logo.scale-100.png" />
129+
<Image Include="Assets\Square150x150Logo.scale-125.png" />
130+
<Image Include="Assets\Square150x150Logo.scale-150.png" />
131+
<Image Include="Assets\Square150x150Logo.scale-200.png" />
132+
<Image Include="Assets\Square150x150Logo.scale-400.png" />
133+
<Image Include="Assets\Square44x44Logo.altform-lightunplated_targetsize-16.png" />
134+
<Image Include="Assets\Square44x44Logo.altform-lightunplated_targetsize-24.png" />
135+
<Image Include="Assets\Square44x44Logo.altform-lightunplated_targetsize-256.png" />
136+
<Image Include="Assets\Square44x44Logo.altform-lightunplated_targetsize-32.png" />
137+
<Image Include="Assets\Square44x44Logo.altform-lightunplated_targetsize-48.png" />
138+
<Image Include="Assets\Square44x44Logo.altform-unplated_targetsize-16.png" />
139+
<Image Include="Assets\Square44x44Logo.altform-unplated_targetsize-256.png" />
140+
<Image Include="Assets\Square44x44Logo.altform-unplated_targetsize-32.png" />
141+
<Image Include="Assets\Square44x44Logo.altform-unplated_targetsize-48.png" />
142+
<Image Include="Assets\Square44x44Logo.scale-100.png" />
143+
<Image Include="Assets\Square44x44Logo.scale-125.png" />
144+
<Image Include="Assets\Square44x44Logo.scale-150.png" />
145+
<Image Include="Assets\Square44x44Logo.scale-200.png" />
146+
<Image Include="Assets\Square44x44Logo.scale-400.png" />
147+
<Image Include="Assets\Square44x44Logo.targetsize-16.png" />
148+
<Image Include="Assets\Square44x44Logo.targetsize-24.png" />
149+
<Image Include="Assets\Square44x44Logo.targetsize-24_altform-unplated.png" />
150+
<Image Include="Assets\Square44x44Logo.targetsize-256.png" />
151+
<Image Include="Assets\Square44x44Logo.targetsize-32.png" />
152+
<Image Include="Assets\Square44x44Logo.targetsize-48.png" />
153+
<Image Include="Assets\StoreLogo.scale-100.png">
154+
<DeploymentContent>true</DeploymentContent>
155+
</Image>
156+
<Image Include="Assets\StoreLogo.scale-125.png" />
157+
<Image Include="Assets\StoreLogo.scale-150.png" />
158+
<Image Include="Assets\StoreLogo.scale-200.png">
159+
<DeploymentContent>true</DeploymentContent>
160+
</Image>
161+
<Image Include="Assets\StoreLogo.scale-400.png" />
162+
<Image Include="Assets\Wide310x150Logo.scale-100.png" />
163+
<Image Include="Assets\Wide310x150Logo.scale-125.png" />
164+
<Image Include="Assets\Wide310x150Logo.scale-150.png" />
165+
<Image Include="Assets\Wide310x150Logo.scale-200.png" />
166+
<Image Include="Assets\Wide310x150Logo.scale-400.png" />
167+
</ItemGroup>
168+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
169+
<ImportGroup Label="ExtensionTargets">
170+
</ImportGroup>
171+
<ItemGroup>
172+
<CustomBuild Include="$(targetname)">
173+
<FileType>Document</FileType>
174+
<ExcludedFromBuild>false</ExcludedFromBuild>
175+
<Message>Copy $(SolutionDir)\$(platform)\$(Configuration)\launcher.exe into $(SolutionDir)\$(platform)\$(Configuration)\$(ProjectName)\$(targetname).exe</Message>
176+
<Command>copy $(SolutionDir)\$(platform)\$(Configuration)\launcher.exe $(SolutionDir)\$(platform)\$(Configuration)\$(ProjectName)\$(targetname).exe</Command>
177+
<Outputs>$(targetname).exe</Outputs>
178+
</CustomBuild>
179+
</ItemGroup>
180+
<ItemGroup>
181+
<None Include="Package.StoreAssociation.xml" />
182+
</ItemGroup>
183+
</Project>

‎meta/24.09/DistroLauncher-Appx/MyDistro.appxmanifest

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:uap2="http://schemas.microsoft.com/appx/manifest/uap/windows10/2" xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3" xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10" xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" IgnorableNamespaces="uap mp uap2 uap3 rescap desktop">
3+
<Identity Name="30248openEuler.openEuler24.09" Version="2409.0.1.0" Publisher="CN=920C954F-C51F-4683-B12C-C821B68C7D6B" ProcessorArchitecture="x64" />
4+
<mp:PhoneIdentity PhoneProductId="6beb03cf-2b7c-47a2-a659-c9d87d6c03c1" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
5+
<Properties>
6+
<DisplayName>openEuler 24.09</DisplayName>
7+
<PublisherDisplayName>openEuler</PublisherDisplayName>
8+
<Logo>Assets\StoreLogo.png</Logo>
9+
</Properties>
10+
<Dependencies>
11+
<TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.16215.0" MaxVersionTested="10.0.16240.0" />
12+
</Dependencies>
13+
<Capabilities>
14+
<rescap:Capability Name="runFullTrust" />
15+
</Capabilities>
16+
<Resources>
17+
<Resource Language="x-generate" />
18+
</Resources>
19+
<Applications>
20+
<Application Id="openEuler2409" Executable="openEuler24.09.exe" EntryPoint="Windows.FullTrustApplication">
21+
<uap:VisualElements DisplayName="openEuler 24.09" Description="openEuler 24.09" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" BackgroundColor="transparent">
22+
<uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png" Square310x310Logo="Assets\LargeTile.png" Square71x71Logo="Assets\SmallTile.png">
23+
</uap:DefaultTile>
24+
<uap:SplashScreen Image="Assets\SplashScreen.png" />
25+
</uap:VisualElements>
26+
<Extensions>
27+
<uap3:Extension Category="windows.appExecutionAlias" Executable="openEuler24.09.exe" EntryPoint="Windows.FullTrustApplication">
28+
<uap3:AppExecutionAlias>
29+
<desktop:ExecutionAlias Alias="openEuler24.09.exe" />
30+
</uap3:AppExecutionAlias>
31+
</uap3:Extension>
32+
</Extensions>
33+
</Application>
34+
</Applications>
35+
</Package>

‎meta/24.09/DistroLauncher/DistributionInfo.h

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
//
2+
// Copyright (C) Microsoft. All rights reserved.
3+
// Licensed under the terms described in the LICENSE file in the root of this project.
4+
//
5+
6+
#pragma once
7+
8+
namespace DistributionInfo
9+
{
10+
// The name of the distribution. This will be displayed to the user via
11+
// wslconfig.exe and in other places. It must conform to the following
12+
// regular expression: ^[a-zA-Z0-9._-]+$
13+
//
14+
// WARNING: This value must not change between versions of your app,
15+
// otherwise users upgrading from older versions will see launch failures.
16+
const std::wstring Name = L"openEuler-24.09";
17+
18+
// The title bar for the console window while the distribution is installing.
19+
const std::wstring WindowTitle = L"openEuler 24.09";
20+
21+
// Create and configure a user account.
22+
bool CreateUser(std::wstring_view userName);
23+
24+
// Query the UID of the user account.
25+
ULONG QueryUid(std::wstring_view userName);
26+
}

‎meta/24.09/meta.json

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"release": "24.09",
3+
"desc_en": "openEuler is an open-source operating system. The current openEuler kernel is based on Linux and supports server, cloud computing, edge computing, embedded, and other application scenarios. openEuler is committed to providing a secure, stable, and easy-to-use operating system. As an efficient, stable, and secure open-source OS built by global open-source contributors, openEuler applies to database, big data, cloud computing, and artificial intelligence (AI) scenarios. In addition, openEuler community is an open-source community for global OSs. Through community cooperation, openEuler builds an innovative platform, builds a unified and open OS that supports multiple processor architectures, and promotes the prosperity of the software and hardware application ecosystem.",
4+
"desc_zh": "openEuler是一款开源操作系统。当前openEuler内核源于Linux，支持鲲鹏及其它多种处理器，能够充分释放计算芯片的潜能，是由全球开源贡献者构建的高效、稳定、安全的开源操作系统，适用于数据库、大数据、云计算、人工智能等应用场景。同时，openEuler是一个面向全球的操作系统开源社区，通过社区合作，打造创新平台，构建支持多处理器架构、统一和开放的操作系统，推动软硬件应用生态繁荣发展。",
5+
"upload_file": "DistroLauncher-Appx_2409.0.1.0_x64_arm64_bundle.appxupload",
6+
"image": "24.09.PNG",
7+
"releasenote_en": "https://docs.openeuler.org/en/docs/24.09/docs/Releasenotes/release_notes.html",
8+
"releasenote_zh": "https://docs.openeuler.org/zh/docs/24.09/docs/Releasenotes/release_notes.html",
9+
"friendlyName": "[email protected]"
10+
}

0 commit comments

Comments
 (0)